markdown-merge 1.0.3 → 7.1.1

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.
Files changed (54) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/LICENSE.md +13 -0
  4. data/README.md +99 -482
  5. data/lib/markdown/merge/backend_support.rb +200 -0
  6. data/lib/markdown/merge/cleanse/block_spacing.rb +18 -23
  7. data/lib/markdown/merge/cleanse/code_fence_spacing.rb +16 -16
  8. data/lib/markdown/merge/cleanse/condensed_link_refs.rb +36 -30
  9. data/lib/markdown/merge/cleanse/list_marker_duplication.rb +66 -0
  10. data/lib/markdown/merge/cleanse/templating_corruption.rb +86 -0
  11. data/lib/markdown/merge/cleanse.rb +5 -3
  12. data/lib/markdown/merge/code_block_match_refiner.rb +111 -0
  13. data/lib/markdown/merge/code_block_merger.rb +489 -47
  14. data/lib/markdown/merge/comment_tracker.rb +42 -0
  15. data/lib/markdown/merge/conflict_resolver.rb +77 -6
  16. data/lib/markdown/merge/debug_logger.rb +2 -2
  17. data/lib/markdown/merge/document_problems.rb +3 -3
  18. data/lib/markdown/merge/file_aligner.rb +433 -133
  19. data/lib/markdown/merge/file_analysis.rb +387 -51
  20. data/lib/markdown/merge/file_analysis_base.rb +188 -51
  21. data/lib/markdown/merge/gap_line_node.rb +14 -8
  22. data/lib/markdown/merge/link_definition_node.rb +5 -5
  23. data/lib/markdown/merge/link_parser.rb +60 -60
  24. data/lib/markdown/merge/link_reference_rehydrator.rb +14 -14
  25. data/lib/markdown/merge/list_match_refiner.rb +98 -0
  26. data/lib/markdown/merge/list_merger.rb +322 -0
  27. data/lib/markdown/merge/markdown_structure.rb +3 -3
  28. data/lib/markdown/merge/merge_result.rb +321 -4
  29. data/lib/markdown/merge/node_type_normalizer.rb +6 -6
  30. data/lib/markdown/merge/output_builder.rb +101 -19
  31. data/lib/markdown/merge/partial_template_merger.rb +248 -27
  32. data/lib/markdown/merge/preservation_support.rb +291 -0
  33. data/lib/markdown/merge/smart_merger.rb +62 -14
  34. data/lib/markdown/merge/smart_merger_base.rb +929 -60
  35. data/lib/markdown/merge/table_match_algorithm.rb +22 -27
  36. data/lib/markdown/merge/table_match_refiner.rb +6 -10
  37. data/lib/markdown/merge/version.rb +5 -4
  38. data/lib/markdown/merge/whitespace_normalizer.rb +25 -33
  39. data/lib/markdown/merge/wrapper_support.rb +194 -0
  40. data/lib/markdown/merge.rb +669 -122
  41. data/lib/markdown-merge.rb +9 -4
  42. data/sig/markdown/merge.rbs +3 -336
  43. data.tar.gz.sig +0 -0
  44. metadata +104 -93
  45. metadata.gz.sig +0 -0
  46. data/CHANGELOG.md +0 -308
  47. data/CITATION.cff +0 -20
  48. data/CODE_OF_CONDUCT.md +0 -134
  49. data/CONTRIBUTING.md +0 -227
  50. data/FUNDING.md +0 -74
  51. data/LICENSE.txt +0 -21
  52. data/REEK +0 -0
  53. data/RUBOCOP.md +0 -71
  54. data/SECURITY.md +0 -21
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: markdown-merge
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.3
4
+ version: 7.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter H. Boling
@@ -38,181 +38,201 @@ cert_chain:
38
38
  date: 1980-01-02 00:00:00.000000000 Z
39
39
  dependencies:
40
40
  - !ruby/object:Gem::Dependency
41
- name: parslet
41
+ name: ast-merge
42
42
  requirement: !ruby/object:Gem::Requirement
43
43
  requirements:
44
- - - "~>"
44
+ - - '='
45
45
  - !ruby/object:Gem::Version
46
- version: '2.0'
46
+ version: 7.1.1
47
47
  type: :runtime
48
48
  prerelease: false
49
49
  version_requirements: !ruby/object:Gem::Requirement
50
50
  requirements:
51
- - - "~>"
51
+ - - '='
52
52
  - !ruby/object:Gem::Version
53
- version: '2.0'
53
+ version: 7.1.1
54
54
  - !ruby/object:Gem::Dependency
55
55
  name: tree_haver
56
56
  requirement: !ruby/object:Gem::Requirement
57
57
  requirements:
58
- - - "~>"
59
- - !ruby/object:Gem::Version
60
- version: '5.0'
61
- - - ">="
58
+ - - '='
62
59
  - !ruby/object:Gem::Version
63
- version: 5.0.5
60
+ version: 7.1.1
64
61
  type: :runtime
65
62
  prerelease: false
66
63
  version_requirements: !ruby/object:Gem::Requirement
67
64
  requirements:
68
- - - "~>"
65
+ - - '='
69
66
  - !ruby/object:Gem::Version
70
- version: '5.0'
71
- - - ">="
72
- - !ruby/object:Gem::Version
73
- version: 5.0.5
67
+ version: 7.1.1
74
68
  - !ruby/object:Gem::Dependency
75
- name: ast-merge
69
+ name: version_gem
76
70
  requirement: !ruby/object:Gem::Requirement
77
71
  requirements:
78
72
  - - "~>"
79
73
  - !ruby/object:Gem::Version
80
- version: '4.0'
74
+ version: '1.1'
81
75
  - - ">="
82
76
  - !ruby/object:Gem::Version
83
- version: 4.0.6
77
+ version: 1.1.15
84
78
  type: :runtime
85
79
  prerelease: false
86
80
  version_requirements: !ruby/object:Gem::Requirement
87
81
  requirements:
88
82
  - - "~>"
89
83
  - !ruby/object:Gem::Version
90
- version: '4.0'
84
+ version: '1.1'
91
85
  - - ">="
92
86
  - !ruby/object:Gem::Version
93
- version: 4.0.6
87
+ version: 1.1.15
94
88
  - !ruby/object:Gem::Dependency
95
- name: version_gem
89
+ name: kettle-dev
96
90
  requirement: !ruby/object:Gem::Requirement
97
91
  requirements:
98
92
  - - "~>"
99
93
  - !ruby/object:Gem::Version
100
- version: '1.1'
94
+ version: '2.5'
101
95
  - - ">="
102
96
  - !ruby/object:Gem::Version
103
- version: 1.1.9
104
- type: :runtime
97
+ version: 2.5.17
98
+ type: :development
105
99
  prerelease: false
106
100
  version_requirements: !ruby/object:Gem::Requirement
107
101
  requirements:
108
102
  - - "~>"
109
103
  - !ruby/object:Gem::Version
110
- version: '1.1'
104
+ version: '2.5'
111
105
  - - ">="
112
106
  - !ruby/object:Gem::Version
113
- version: 1.1.9
107
+ version: 2.5.17
114
108
  - !ruby/object:Gem::Dependency
115
- name: kettle-dev
109
+ name: bundler-audit
116
110
  requirement: !ruby/object:Gem::Requirement
117
111
  requirements:
118
112
  - - "~>"
119
113
  - !ruby/object:Gem::Version
120
- version: '1.1'
114
+ version: 0.9.3
121
115
  type: :development
122
116
  prerelease: false
123
117
  version_requirements: !ruby/object:Gem::Requirement
124
118
  requirements:
125
119
  - - "~>"
126
120
  - !ruby/object:Gem::Version
127
- version: '1.1'
121
+ version: 0.9.3
128
122
  - !ruby/object:Gem::Dependency
129
- name: bundler-audit
123
+ name: rake
130
124
  requirement: !ruby/object:Gem::Requirement
131
125
  requirements:
132
126
  - - "~>"
133
127
  - !ruby/object:Gem::Version
134
- version: 0.9.2
128
+ version: '13.0'
135
129
  type: :development
136
130
  prerelease: false
137
131
  version_requirements: !ruby/object:Gem::Requirement
138
132
  requirements:
139
133
  - - "~>"
140
134
  - !ruby/object:Gem::Version
141
- version: 0.9.2
135
+ version: '13.0'
142
136
  - !ruby/object:Gem::Dependency
143
- name: rake
137
+ name: require_bench
144
138
  requirement: !ruby/object:Gem::Requirement
145
139
  requirements:
146
140
  - - "~>"
147
141
  - !ruby/object:Gem::Version
148
- version: '13.0'
142
+ version: '1.0'
143
+ - - ">="
144
+ - !ruby/object:Gem::Version
145
+ version: 1.0.4
149
146
  type: :development
150
147
  prerelease: false
151
148
  version_requirements: !ruby/object:Gem::Requirement
152
149
  requirements:
153
150
  - - "~>"
154
151
  - !ruby/object:Gem::Version
155
- version: '13.0'
152
+ version: '1.0'
153
+ - - ">="
154
+ - !ruby/object:Gem::Version
155
+ version: 1.0.4
156
156
  - !ruby/object:Gem::Dependency
157
- name: require_bench
157
+ name: anonymous_loader
158
158
  requirement: !ruby/object:Gem::Requirement
159
159
  requirements:
160
160
  - - "~>"
161
161
  - !ruby/object:Gem::Version
162
- version: '1.0'
162
+ version: '0.1'
163
163
  - - ">="
164
164
  - !ruby/object:Gem::Version
165
- version: 1.0.4
165
+ version: 0.1.3
166
166
  type: :development
167
167
  prerelease: false
168
168
  version_requirements: !ruby/object:Gem::Requirement
169
169
  requirements:
170
170
  - - "~>"
171
171
  - !ruby/object:Gem::Version
172
- version: '1.0'
172
+ version: '0.1'
173
173
  - - ">="
174
174
  - !ruby/object:Gem::Version
175
- version: 1.0.4
175
+ version: 0.1.3
176
176
  - !ruby/object:Gem::Dependency
177
177
  name: appraisal2
178
178
  requirement: !ruby/object:Gem::Requirement
179
179
  requirements:
180
180
  - - "~>"
181
181
  - !ruby/object:Gem::Version
182
- version: '3.0'
183
- - - "~>"
182
+ version: '3.2'
183
+ - - ">="
184
184
  - !ruby/object:Gem::Version
185
- version: 3.0.6
185
+ version: 3.2.0
186
186
  type: :development
187
187
  prerelease: false
188
188
  version_requirements: !ruby/object:Gem::Requirement
189
189
  requirements:
190
190
  - - "~>"
191
191
  - !ruby/object:Gem::Version
192
- version: '3.0'
193
- - - "~>"
192
+ version: '3.2'
193
+ - - ">="
194
194
  - !ruby/object:Gem::Version
195
- version: 3.0.6
195
+ version: 3.2.0
196
196
  - !ruby/object:Gem::Dependency
197
197
  name: kettle-test
198
198
  requirement: !ruby/object:Gem::Requirement
199
199
  requirements:
200
200
  - - "~>"
201
201
  - !ruby/object:Gem::Version
202
- version: '1.0'
202
+ version: '2.0'
203
203
  - - ">="
204
204
  - !ruby/object:Gem::Version
205
- version: 1.0.10
205
+ version: 2.0.19
206
206
  type: :development
207
207
  prerelease: false
208
208
  version_requirements: !ruby/object:Gem::Requirement
209
209
  requirements:
210
210
  - - "~>"
211
211
  - !ruby/object:Gem::Version
212
- version: '1.0'
212
+ version: '2.0'
213
213
  - - ">="
214
214
  - !ruby/object:Gem::Version
215
- version: 1.0.10
215
+ version: 2.0.19
216
+ - !ruby/object:Gem::Dependency
217
+ name: turbo_tests2
218
+ requirement: !ruby/object:Gem::Requirement
219
+ requirements:
220
+ - - "~>"
221
+ - !ruby/object:Gem::Version
222
+ version: '3.2'
223
+ - - ">="
224
+ - !ruby/object:Gem::Version
225
+ version: 3.2.4
226
+ type: :development
227
+ prerelease: false
228
+ version_requirements: !ruby/object:Gem::Requirement
229
+ requirements:
230
+ - - "~>"
231
+ - !ruby/object:Gem::Version
232
+ version: '3.2'
233
+ - - ">="
234
+ - !ruby/object:Gem::Version
235
+ version: 3.2.4
216
236
  - !ruby/object:Gem::Dependency
217
237
  name: ruby-progressbar
218
238
  requirement: !ruby/object:Gem::Requirement
@@ -236,7 +256,7 @@ dependencies:
236
256
  version: '1.0'
237
257
  - - ">="
238
258
  - !ruby/object:Gem::Version
239
- version: 1.0.3
259
+ version: 1.0.8
240
260
  type: :development
241
261
  prerelease: false
242
262
  version_requirements: !ruby/object:Gem::Requirement
@@ -246,62 +266,49 @@ dependencies:
246
266
  version: '1.0'
247
267
  - - ">="
248
268
  - !ruby/object:Gem::Version
249
- version: 1.0.3
269
+ version: 1.0.8
250
270
  - !ruby/object:Gem::Dependency
251
271
  name: gitmoji-regex
252
272
  requirement: !ruby/object:Gem::Requirement
253
273
  requirements:
254
274
  - - "~>"
255
275
  - !ruby/object:Gem::Version
256
- version: '1.0'
276
+ version: '2.0'
257
277
  - - ">="
258
278
  - !ruby/object:Gem::Version
259
- version: 1.0.3
279
+ version: 2.0.11
260
280
  type: :development
261
281
  prerelease: false
262
282
  version_requirements: !ruby/object:Gem::Requirement
263
283
  requirements:
264
284
  - - "~>"
265
285
  - !ruby/object:Gem::Version
266
- version: '1.0'
286
+ version: '2.0'
267
287
  - - ">="
268
288
  - !ruby/object:Gem::Version
269
- version: 1.0.3
270
- description: "☯️ Ast::Merge-based structure for merging Markdown files with tools
271
- like markly-merge and commonmarker-merge"
289
+ version: 2.0.11
290
+ description: "☯️ Portable Markdown owner analysis and matching behavior for Structured
291
+ Merge."
272
292
  email:
273
293
  - floss@galtzo.com
274
294
  executables: []
275
295
  extensions: []
276
- extra_rdoc_files:
277
- - CHANGELOG.md
278
- - CITATION.cff
279
- - CODE_OF_CONDUCT.md
280
- - CONTRIBUTING.md
281
- - FUNDING.md
282
- - LICENSE.txt
283
- - README.md
284
- - REEK
285
- - RUBOCOP.md
286
- - SECURITY.md
296
+ extra_rdoc_files: []
287
297
  files:
288
- - CHANGELOG.md
289
- - CITATION.cff
290
- - CODE_OF_CONDUCT.md
291
- - CONTRIBUTING.md
292
- - FUNDING.md
293
- - LICENSE.txt
298
+ - LICENSE.md
294
299
  - README.md
295
- - REEK
296
- - RUBOCOP.md
297
- - SECURITY.md
298
300
  - lib/markdown-merge.rb
299
301
  - lib/markdown/merge.rb
302
+ - lib/markdown/merge/backend_support.rb
300
303
  - lib/markdown/merge/cleanse.rb
301
304
  - lib/markdown/merge/cleanse/block_spacing.rb
302
305
  - lib/markdown/merge/cleanse/code_fence_spacing.rb
303
306
  - lib/markdown/merge/cleanse/condensed_link_refs.rb
307
+ - lib/markdown/merge/cleanse/list_marker_duplication.rb
308
+ - lib/markdown/merge/cleanse/templating_corruption.rb
309
+ - lib/markdown/merge/code_block_match_refiner.rb
304
310
  - lib/markdown/merge/code_block_merger.rb
311
+ - lib/markdown/merge/comment_tracker.rb
305
312
  - lib/markdown/merge/conflict_resolver.rb
306
313
  - lib/markdown/merge/debug_logger.rb
307
314
  - lib/markdown/merge/document_problems.rb
@@ -314,36 +321,41 @@ files:
314
321
  - lib/markdown/merge/link_definition_node.rb
315
322
  - lib/markdown/merge/link_parser.rb
316
323
  - lib/markdown/merge/link_reference_rehydrator.rb
324
+ - lib/markdown/merge/list_match_refiner.rb
325
+ - lib/markdown/merge/list_merger.rb
317
326
  - lib/markdown/merge/markdown_structure.rb
318
327
  - lib/markdown/merge/merge_result.rb
319
328
  - lib/markdown/merge/node_type_normalizer.rb
320
329
  - lib/markdown/merge/output_builder.rb
321
330
  - lib/markdown/merge/partial_template_merger.rb
331
+ - lib/markdown/merge/preservation_support.rb
322
332
  - lib/markdown/merge/smart_merger.rb
323
333
  - lib/markdown/merge/smart_merger_base.rb
324
334
  - lib/markdown/merge/table_match_algorithm.rb
325
335
  - lib/markdown/merge/table_match_refiner.rb
326
336
  - lib/markdown/merge/version.rb
327
337
  - lib/markdown/merge/whitespace_normalizer.rb
338
+ - lib/markdown/merge/wrapper_support.rb
328
339
  - sig/markdown/merge.rbs
329
- homepage: https://github.com/kettle-rb/markdown-merge
340
+ homepage: https://github.com/structuredmerge/structuredmerge-ruby
330
341
  licenses:
331
- - MIT
342
+ - AGPL-3.0-only
343
+ - PolyForm-Small-Business-1.0.0
332
344
  metadata:
333
- homepage_uri: https://markdown-merge.galtzo.com/
334
- source_code_uri: https://github.com/kettle-rb/markdown-merge/tree/v1.0.3
335
- changelog_uri: https://github.com/kettle-rb/markdown-merge/blob/v1.0.3/CHANGELOG.md
336
- bug_tracker_uri: https://github.com/kettle-rb/markdown-merge/issues
337
- documentation_uri: https://www.rubydoc.info/gems/markdown-merge/1.0.3
345
+ homepage_uri: https://structuredmerge.org
346
+ source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.1
347
+ changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.1/CHANGELOG.md
348
+ bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
349
+ documentation_uri: https://www.rubydoc.info/gems/markdown-merge/7.1.1
338
350
  funding_uri: https://github.com/sponsors/pboling
339
- wiki_uri: https://github.com/kettle-rb/markdown-merge/wiki
351
+ wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
340
352
  news_uri: https://www.railsbling.com/tags/markdown-merge
341
353
  discord_uri: https://discord.gg/3qme4XHNKN
354
+ mailing_list_uri: https://www.rubyforum.org/tag/structuredmerge
342
355
  rubygems_mfa_required: 'true'
343
356
  rdoc_options:
344
357
  - "--title"
345
- - markdown-merge - ☯️ Ast::Merge-based structure for building Markdown merging tools
346
- like markly-merge and commonmarker-merge
358
+ - markdown-merge - ☯️ Structured Merge Markdown analysis and matching for Ruby
347
359
  - "--main"
348
360
  - README.md
349
361
  - "--exclude"
@@ -357,15 +369,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
357
369
  requirements:
358
370
  - - ">="
359
371
  - !ruby/object:Gem::Version
360
- version: 3.2.0
372
+ version: 4.0.0
361
373
  required_rubygems_version: !ruby/object:Gem::Requirement
362
374
  requirements:
363
375
  - - ">="
364
376
  - !ruby/object:Gem::Version
365
377
  version: '0'
366
378
  requirements: []
367
- rubygems_version: 4.0.5
379
+ rubygems_version: 4.0.17
368
380
  specification_version: 4
369
- summary: "☯️ Ast::Merge-based structure for building Markdown merging tools like markly-merge
370
- and commonmarker-merge"
381
+ summary: "☯️ Structured Merge Markdown analysis and matching for Ruby"
371
382
  test_files: []
metadata.gz.sig CHANGED
Binary file