ast-merge 3.0.0 → 4.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data/CHANGELOG.md +95 -1
- data/README.md +258 -186
- data/exe/ast-merge-recipe +20 -0
- data/lib/ast/merge/conflict_resolver_base.rb +47 -1
- data/lib/ast/merge/diff_mapper_base.rb +245 -0
- data/lib/ast/merge/emitter_base.rb +123 -0
- data/lib/ast/merge/freeze_node_base.rb +9 -0
- data/lib/ast/merge/navigable/injection_point.rb +132 -0
- data/lib/ast/merge/navigable/injection_point_finder.rb +98 -0
- data/lib/ast/merge/navigable/statement.rb +380 -0
- data/lib/ast/merge/navigable.rb +20 -0
- data/lib/ast/merge/node_typing.rb +21 -0
- data/lib/ast/merge/partial_template_merger_base.rb +4 -2
- data/lib/ast/merge/recipe/preset.rb +18 -0
- data/lib/ast/merge/recipe/runner.rb +8 -1
- data/lib/ast/merge/version.rb +1 -1
- data/lib/ast/merge.rb +3 -3
- data.tar.gz.sig +0 -0
- metadata +34 -9
- metadata.gz.sig +0 -0
- data/lib/ast/merge/navigable_statement.rb +0 -625
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ast-merge
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version:
|
|
4
|
+
version: 4.0.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Peter H. Boling
|
|
@@ -63,20 +63,20 @@ dependencies:
|
|
|
63
63
|
requirements:
|
|
64
64
|
- - "~>"
|
|
65
65
|
- !ruby/object:Gem::Version
|
|
66
|
-
version: '
|
|
66
|
+
version: '5.0'
|
|
67
67
|
- - ">="
|
|
68
68
|
- !ruby/object:Gem::Version
|
|
69
|
-
version:
|
|
69
|
+
version: 5.0.0
|
|
70
70
|
type: :runtime
|
|
71
71
|
prerelease: false
|
|
72
72
|
version_requirements: !ruby/object:Gem::Requirement
|
|
73
73
|
requirements:
|
|
74
74
|
- - "~>"
|
|
75
75
|
- !ruby/object:Gem::Version
|
|
76
|
-
version: '
|
|
76
|
+
version: '5.0'
|
|
77
77
|
- - ">="
|
|
78
78
|
- !ruby/object:Gem::Version
|
|
79
|
-
version:
|
|
79
|
+
version: 5.0.0
|
|
80
80
|
- !ruby/object:Gem::Dependency
|
|
81
81
|
name: kettle-dev
|
|
82
82
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -261,6 +261,26 @@ dependencies:
|
|
|
261
261
|
- - ">="
|
|
262
262
|
- !ruby/object:Gem::Version
|
|
263
263
|
version: 1.0.3
|
|
264
|
+
- !ruby/object:Gem::Dependency
|
|
265
|
+
name: ostruct
|
|
266
|
+
requirement: !ruby/object:Gem::Requirement
|
|
267
|
+
requirements:
|
|
268
|
+
- - "~>"
|
|
269
|
+
- !ruby/object:Gem::Version
|
|
270
|
+
version: '0.6'
|
|
271
|
+
- - ">="
|
|
272
|
+
- !ruby/object:Gem::Version
|
|
273
|
+
version: 0.6.3
|
|
274
|
+
type: :development
|
|
275
|
+
prerelease: false
|
|
276
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
277
|
+
requirements:
|
|
278
|
+
- - "~>"
|
|
279
|
+
- !ruby/object:Gem::Version
|
|
280
|
+
version: '0.6'
|
|
281
|
+
- - ">="
|
|
282
|
+
- !ruby/object:Gem::Version
|
|
283
|
+
version: 0.6.3
|
|
264
284
|
description: "☯️ Ast::Merge provides base classes, modules, and RSpec shared examples
|
|
265
285
|
for building intelligent file mergers using AST analysis. It powers prism-merge,
|
|
266
286
|
psych-merge, json-merge, and other format-specific merge gems."
|
|
@@ -309,6 +329,8 @@ files:
|
|
|
309
329
|
- lib/ast/merge/detector/mergeable.rb
|
|
310
330
|
- lib/ast/merge/detector/toml_frontmatter.rb
|
|
311
331
|
- lib/ast/merge/detector/yaml_frontmatter.rb
|
|
332
|
+
- lib/ast/merge/diff_mapper_base.rb
|
|
333
|
+
- lib/ast/merge/emitter_base.rb
|
|
312
334
|
- lib/ast/merge/file_analyzable.rb
|
|
313
335
|
- lib/ast/merge/freezable.rb
|
|
314
336
|
- lib/ast/merge/freeze_node_base.rb
|
|
@@ -316,7 +338,10 @@ files:
|
|
|
316
338
|
- lib/ast/merge/match_score_base.rb
|
|
317
339
|
- lib/ast/merge/merge_result_base.rb
|
|
318
340
|
- lib/ast/merge/merger_config.rb
|
|
319
|
-
- lib/ast/merge/
|
|
341
|
+
- lib/ast/merge/navigable.rb
|
|
342
|
+
- lib/ast/merge/navigable/injection_point.rb
|
|
343
|
+
- lib/ast/merge/navigable/injection_point_finder.rb
|
|
344
|
+
- lib/ast/merge/navigable/statement.rb
|
|
320
345
|
- lib/ast/merge/node_typing.rb
|
|
321
346
|
- lib/ast/merge/node_typing/frozen_wrapper.rb
|
|
322
347
|
- lib/ast/merge/node_typing/normalizer.rb
|
|
@@ -356,10 +381,10 @@ licenses:
|
|
|
356
381
|
- MIT
|
|
357
382
|
metadata:
|
|
358
383
|
homepage_uri: https://ast-merge.galtzo.com/
|
|
359
|
-
source_code_uri: https://github.com/kettle-rb/ast-merge/tree/
|
|
360
|
-
changelog_uri: https://github.com/kettle-rb/ast-merge/blob/
|
|
384
|
+
source_code_uri: https://github.com/kettle-rb/ast-merge/tree/v4.0.0
|
|
385
|
+
changelog_uri: https://github.com/kettle-rb/ast-merge/blob/v4.0.0/CHANGELOG.md
|
|
361
386
|
bug_tracker_uri: https://github.com/kettle-rb/ast-merge/issues
|
|
362
|
-
documentation_uri: https://www.rubydoc.info/gems/ast-merge/
|
|
387
|
+
documentation_uri: https://www.rubydoc.info/gems/ast-merge/4.0.0
|
|
363
388
|
funding_uri: https://github.com/sponsors/pboling
|
|
364
389
|
wiki_uri: https://github.com/kettle-rb/ast-merge/wiki
|
|
365
390
|
news_uri: https://www.railsbling.com/tags/ast-merge
|
metadata.gz.sig
CHANGED
|
Binary file
|