ast-merge-git 7.1.1 → 7.1.3

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 (12) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/README.md +23 -13
  4. data/exe/ast-merge-git +118 -0
  5. data/lib/ast/merge/git/corpus.rb +580 -0
  6. data/lib/ast/merge/git/local_benchmark.rb +864 -0
  7. data/lib/ast/merge/git/version.rb +1 -1
  8. data/lib/ast/merge/git.rb +196 -343
  9. data/sig/ast/merge/git.rbs +106 -0
  10. data.tar.gz.sig +0 -0
  11. metadata +302 -33
  12. metadata.gz.sig +0 -0
data/sig/ast/merge/git.rbs CHANGED
@@ -5,6 +5,112 @@ module Ast
5
5
  VERSION: String
6
6
  end
7
7
  VERSION: String
8
+
9
+ PACKAGE_NAME: String
10
+ EXIT_SUCCESS: Integer
11
+ EXIT_CONFLICT: Integer
12
+ EXIT_ERROR: Integer
13
+ CONFLICT_POLICIES: Array[Symbol]
14
+ ADAPTER_ERROR_CATEGORIES: Array[Symbol]
15
+
16
+ def self.merge3: (Hash[Symbol | String, untyped] request) -> Hash[Symbol, untyped]
17
+ def self.merge_files: (
18
+ base_path: String | Pathname,
19
+ ours_path: String | Pathname,
20
+ theirs_path: String | Pathname,
21
+ ?conflict_policy: Symbol | String,
22
+ **untyped
23
+ ) -> Hash[Symbol, untyped]
24
+ def self.run: (Array[String] argv, ?env: Hash[String, String], ?stderr: IO) -> Integer
25
+ def self.git_exit_code: (Hash[Symbol, untyped] result) -> Integer
26
+
27
+ class Corpus
28
+ class Error < StandardError
29
+ end
30
+
31
+ CLASSIFICATIONS: Array[String]
32
+ BACKLOG_STATUSES: Array[String]
33
+ SHA_PATTERN: Regexp
34
+ REQUIRED_CASE_KEYS: Array[String]
35
+
36
+ attr_reader manifest: Hash[String, untyped]
37
+
38
+ def self.load: (String path) -> Corpus
39
+ def initialize: (Hash[String, untyped] manifest) -> void
40
+ def validate!: () -> true
41
+ def cases: (?String? case_id) -> Array[Hash[String, untyped]]
42
+ end
43
+
44
+ class CorpusRunner
45
+ DEFAULT_TIMEOUT: Integer
46
+ OUTCOMES: Array[String]
47
+
48
+ def initialize: (
49
+ corpus: Corpus,
50
+ repository: String | Pathname,
51
+ driver_path: String | Pathname,
52
+ tmp_root: String | Pathname,
53
+ ?timeout: Integer
54
+ ) -> void
55
+ def run: (?case_id: String?) -> Array[Hash[Symbol, untyped]]
56
+ end
57
+
58
+ class CorpusAcquirer
59
+ def self.acquire: (
60
+ corpus: Corpus,
61
+ destination: String | Pathname,
62
+ tmp_root: String | Pathname
63
+ ) -> Pathname
64
+ end
65
+
66
+ class LocalBenchmark
67
+ class Error < StandardError
68
+ end
69
+
70
+ SCHEMA: String
71
+ CASE_SCHEMA: String
72
+ OPERATIONS: Array[String]
73
+ PARTITIONS: Array[String]
74
+ EXPECTATIONS: Array[String]
75
+ SEVERITIES: Array[String]
76
+ PRESERVATION: Array[String]
77
+ TRANSFORMATIONS: Array[String]
78
+ ID_PATTERN: Regexp
79
+ PROVENANCE_FIELDS: Array[String]
80
+ SELECTOR_FIELDS: Array[String]
81
+ INPUT_ROLES: Hash[String, Array[String]]
82
+
83
+ attr_reader document: Hash[String, untyped]
84
+ attr_reader corpus_digest: String
85
+ attr_reader path: Pathname?
86
+
87
+ def self.load: (String | Pathname path) -> LocalBenchmark
88
+ def initialize: (Hash[String, untyped] document, ?path: (String | Pathname)?, ?corpus_digest: String?) -> void
89
+ def validate!: () -> true
90
+ def cases: () -> Array[Hash[String, untyped]]
91
+ def select: (profile: String | Symbol, ?changed_paths: Array[String]) -> Hash[String, untyped]
92
+ def case_by_id: (String id) -> Hash[String, untyped]
93
+ end
94
+
95
+ class LocalBenchmarkRunner
96
+ DEFAULT_TIMEOUT: Integer
97
+
98
+ def initialize: (
99
+ benchmark: LocalBenchmark,
100
+ driver_path: String | Pathname,
101
+ tmp_root: String | Pathname,
102
+ ?timeout: Integer
103
+ ) -> void
104
+ def run: (profile: String | Symbol, ?changed_paths: Array[String]) -> Hash[String, untyped]
105
+ end
106
+
107
+ class LocalBenchmarkReport
108
+ SUCCESS: Array[String]
109
+
110
+ def self.build: (Hash[String, untyped] run) -> Hash[String, untyped]
111
+ def initialize: (Hash[String, untyped] run) -> void
112
+ def build: () -> Hash[String, untyped]
113
+ end
8
114
  end
9
115
  end
10
116
  end
data.tar.gz.sig CHANGED
Binary file
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ast-merge-git
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.1.1
4
+ version: 7.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter H. Boling
@@ -43,28 +43,14 @@ dependencies:
43
43
  requirements:
44
44
  - - '='
45
45
  - !ruby/object:Gem::Version
46
- version: 7.1.1
46
+ version: 7.1.3
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: 7.1.1
54
- - !ruby/object:Gem::Dependency
55
- name: json-merge
56
- requirement: !ruby/object:Gem::Requirement
57
- requirements:
58
- - - '='
59
- - !ruby/object:Gem::Version
60
- version: 7.1.1
61
- type: :runtime
62
- prerelease: false
63
- version_requirements: !ruby/object:Gem::Requirement
64
- requirements:
65
- - - '='
66
- - !ruby/object:Gem::Version
67
- version: 7.1.1
53
+ version: 7.1.3
68
54
  - !ruby/object:Gem::Dependency
69
55
  name: version_gem
70
56
  requirement: !ruby/object:Gem::Requirement
@@ -91,20 +77,20 @@ dependencies:
91
77
  requirements:
92
78
  - - "~>"
93
79
  - !ruby/object:Gem::Version
94
- version: '2.5'
80
+ version: '3.0'
95
81
  - - ">="
96
82
  - !ruby/object:Gem::Version
97
- version: 2.5.17
83
+ version: 3.0.0
98
84
  type: :development
99
85
  prerelease: false
100
86
  version_requirements: !ruby/object:Gem::Requirement
101
87
  requirements:
102
88
  - - "~>"
103
89
  - !ruby/object:Gem::Version
104
- version: '2.5'
90
+ version: '3.0'
105
91
  - - ">="
106
92
  - !ruby/object:Gem::Version
107
- version: 2.5.17
93
+ version: 3.0.0
108
94
  - !ruby/object:Gem::Dependency
109
95
  name: bundler-audit
110
96
  requirement: !ruby/object:Gem::Requirement
@@ -182,7 +168,7 @@ dependencies:
182
168
  version: '3.2'
183
169
  - - ">="
184
170
  - !ruby/object:Gem::Version
185
- version: 3.2.0
171
+ version: 3.2.2
186
172
  type: :development
187
173
  prerelease: false
188
174
  version_requirements: !ruby/object:Gem::Requirement
@@ -192,7 +178,7 @@ dependencies:
192
178
  version: '3.2'
193
179
  - - ">="
194
180
  - !ruby/object:Gem::Version
195
- version: 3.2.0
181
+ version: 3.2.2
196
182
  - !ruby/object:Gem::Dependency
197
183
  name: kettle-test
198
184
  requirement: !ruby/object:Gem::Requirement
@@ -222,7 +208,7 @@ dependencies:
222
208
  version: '3.2'
223
209
  - - ">="
224
210
  - !ruby/object:Gem::Version
225
- version: 3.2.4
211
+ version: 3.2.5
226
212
  type: :development
227
213
  prerelease: false
228
214
  version_requirements: !ruby/object:Gem::Requirement
@@ -232,7 +218,287 @@ dependencies:
232
218
  version: '3.2'
233
219
  - - ">="
234
220
  - !ruby/object:Gem::Version
235
- version: 3.2.4
221
+ version: 3.2.5
222
+ - !ruby/object:Gem::Dependency
223
+ name: bash-merge
224
+ requirement: !ruby/object:Gem::Requirement
225
+ requirements:
226
+ - - '='
227
+ - !ruby/object:Gem::Version
228
+ version: 7.1.3
229
+ type: :development
230
+ prerelease: false
231
+ version_requirements: !ruby/object:Gem::Requirement
232
+ requirements:
233
+ - - '='
234
+ - !ruby/object:Gem::Version
235
+ version: 7.1.3
236
+ - !ruby/object:Gem::Dependency
237
+ name: citrus-toml-merge
238
+ requirement: !ruby/object:Gem::Requirement
239
+ requirements:
240
+ - - '='
241
+ - !ruby/object:Gem::Version
242
+ version: 7.1.3
243
+ type: :development
244
+ prerelease: false
245
+ version_requirements: !ruby/object:Gem::Requirement
246
+ requirements:
247
+ - - '='
248
+ - !ruby/object:Gem::Version
249
+ version: 7.1.3
250
+ - !ruby/object:Gem::Dependency
251
+ name: commonmarker-merge
252
+ requirement: !ruby/object:Gem::Requirement
253
+ requirements:
254
+ - - '='
255
+ - !ruby/object:Gem::Version
256
+ version: 7.1.3
257
+ type: :development
258
+ prerelease: false
259
+ version_requirements: !ruby/object:Gem::Requirement
260
+ requirements:
261
+ - - '='
262
+ - !ruby/object:Gem::Version
263
+ version: 7.1.3
264
+ - !ruby/object:Gem::Dependency
265
+ name: dotenv-merge
266
+ requirement: !ruby/object:Gem::Requirement
267
+ requirements:
268
+ - - '='
269
+ - !ruby/object:Gem::Version
270
+ version: 7.1.3
271
+ type: :development
272
+ prerelease: false
273
+ version_requirements: !ruby/object:Gem::Requirement
274
+ requirements:
275
+ - - '='
276
+ - !ruby/object:Gem::Version
277
+ version: 7.1.3
278
+ - !ruby/object:Gem::Dependency
279
+ name: go-merge
280
+ requirement: !ruby/object:Gem::Requirement
281
+ requirements:
282
+ - - '='
283
+ - !ruby/object:Gem::Version
284
+ version: 7.1.3
285
+ type: :development
286
+ prerelease: false
287
+ version_requirements: !ruby/object:Gem::Requirement
288
+ requirements:
289
+ - - '='
290
+ - !ruby/object:Gem::Version
291
+ version: 7.1.3
292
+ - !ruby/object:Gem::Dependency
293
+ name: html-merge
294
+ requirement: !ruby/object:Gem::Requirement
295
+ requirements:
296
+ - - '='
297
+ - !ruby/object:Gem::Version
298
+ version: 7.1.3
299
+ type: :development
300
+ prerelease: false
301
+ version_requirements: !ruby/object:Gem::Requirement
302
+ requirements:
303
+ - - '='
304
+ - !ruby/object:Gem::Version
305
+ version: 7.1.3
306
+ - !ruby/object:Gem::Dependency
307
+ name: json-merge
308
+ requirement: !ruby/object:Gem::Requirement
309
+ requirements:
310
+ - - '='
311
+ - !ruby/object:Gem::Version
312
+ version: 7.1.3
313
+ type: :development
314
+ prerelease: false
315
+ version_requirements: !ruby/object:Gem::Requirement
316
+ requirements:
317
+ - - '='
318
+ - !ruby/object:Gem::Version
319
+ version: 7.1.3
320
+ - !ruby/object:Gem::Dependency
321
+ name: kramdown-merge
322
+ requirement: !ruby/object:Gem::Requirement
323
+ requirements:
324
+ - - '='
325
+ - !ruby/object:Gem::Version
326
+ version: 7.1.3
327
+ type: :development
328
+ prerelease: false
329
+ version_requirements: !ruby/object:Gem::Requirement
330
+ requirements:
331
+ - - '='
332
+ - !ruby/object:Gem::Version
333
+ version: 7.1.3
334
+ - !ruby/object:Gem::Dependency
335
+ name: markdown-merge
336
+ requirement: !ruby/object:Gem::Requirement
337
+ requirements:
338
+ - - '='
339
+ - !ruby/object:Gem::Version
340
+ version: 7.1.3
341
+ type: :development
342
+ prerelease: false
343
+ version_requirements: !ruby/object:Gem::Requirement
344
+ requirements:
345
+ - - '='
346
+ - !ruby/object:Gem::Version
347
+ version: 7.1.3
348
+ - !ruby/object:Gem::Dependency
349
+ name: markly-merge
350
+ requirement: !ruby/object:Gem::Requirement
351
+ requirements:
352
+ - - '='
353
+ - !ruby/object:Gem::Version
354
+ version: 7.1.3
355
+ type: :development
356
+ prerelease: false
357
+ version_requirements: !ruby/object:Gem::Requirement
358
+ requirements:
359
+ - - '='
360
+ - !ruby/object:Gem::Version
361
+ version: 7.1.3
362
+ - !ruby/object:Gem::Dependency
363
+ name: parslet-toml-merge
364
+ requirement: !ruby/object:Gem::Requirement
365
+ requirements:
366
+ - - '='
367
+ - !ruby/object:Gem::Version
368
+ version: 7.1.3
369
+ type: :development
370
+ prerelease: false
371
+ version_requirements: !ruby/object:Gem::Requirement
372
+ requirements:
373
+ - - '='
374
+ - !ruby/object:Gem::Version
375
+ version: 7.1.3
376
+ - !ruby/object:Gem::Dependency
377
+ name: plain-merge
378
+ requirement: !ruby/object:Gem::Requirement
379
+ requirements:
380
+ - - '='
381
+ - !ruby/object:Gem::Version
382
+ version: 7.1.3
383
+ type: :development
384
+ prerelease: false
385
+ version_requirements: !ruby/object:Gem::Requirement
386
+ requirements:
387
+ - - '='
388
+ - !ruby/object:Gem::Version
389
+ version: 7.1.3
390
+ - !ruby/object:Gem::Dependency
391
+ name: psych-merge
392
+ requirement: !ruby/object:Gem::Requirement
393
+ requirements:
394
+ - - '='
395
+ - !ruby/object:Gem::Version
396
+ version: 7.1.3
397
+ type: :development
398
+ prerelease: false
399
+ version_requirements: !ruby/object:Gem::Requirement
400
+ requirements:
401
+ - - '='
402
+ - !ruby/object:Gem::Version
403
+ version: 7.1.3
404
+ - !ruby/object:Gem::Dependency
405
+ name: rbs-merge
406
+ requirement: !ruby/object:Gem::Requirement
407
+ requirements:
408
+ - - '='
409
+ - !ruby/object:Gem::Version
410
+ version: 7.1.3
411
+ type: :development
412
+ prerelease: false
413
+ version_requirements: !ruby/object:Gem::Requirement
414
+ requirements:
415
+ - - '='
416
+ - !ruby/object:Gem::Version
417
+ version: 7.1.3
418
+ - !ruby/object:Gem::Dependency
419
+ name: ruby-merge
420
+ requirement: !ruby/object:Gem::Requirement
421
+ requirements:
422
+ - - '='
423
+ - !ruby/object:Gem::Version
424
+ version: 7.1.3
425
+ type: :development
426
+ prerelease: false
427
+ version_requirements: !ruby/object:Gem::Requirement
428
+ requirements:
429
+ - - '='
430
+ - !ruby/object:Gem::Version
431
+ version: 7.1.3
432
+ - !ruby/object:Gem::Dependency
433
+ name: rust-merge
434
+ requirement: !ruby/object:Gem::Requirement
435
+ requirements:
436
+ - - '='
437
+ - !ruby/object:Gem::Version
438
+ version: 7.1.3
439
+ type: :development
440
+ prerelease: false
441
+ version_requirements: !ruby/object:Gem::Requirement
442
+ requirements:
443
+ - - '='
444
+ - !ruby/object:Gem::Version
445
+ version: 7.1.3
446
+ - !ruby/object:Gem::Dependency
447
+ name: toml-merge
448
+ requirement: !ruby/object:Gem::Requirement
449
+ requirements:
450
+ - - '='
451
+ - !ruby/object:Gem::Version
452
+ version: 7.1.3
453
+ type: :development
454
+ prerelease: false
455
+ version_requirements: !ruby/object:Gem::Requirement
456
+ requirements:
457
+ - - '='
458
+ - !ruby/object:Gem::Version
459
+ version: 7.1.3
460
+ - !ruby/object:Gem::Dependency
461
+ name: typescript-merge
462
+ requirement: !ruby/object:Gem::Requirement
463
+ requirements:
464
+ - - '='
465
+ - !ruby/object:Gem::Version
466
+ version: 7.1.3
467
+ type: :development
468
+ prerelease: false
469
+ version_requirements: !ruby/object:Gem::Requirement
470
+ requirements:
471
+ - - '='
472
+ - !ruby/object:Gem::Version
473
+ version: 7.1.3
474
+ - !ruby/object:Gem::Dependency
475
+ name: yaml-merge
476
+ requirement: !ruby/object:Gem::Requirement
477
+ requirements:
478
+ - - '='
479
+ - !ruby/object:Gem::Version
480
+ version: 7.1.3
481
+ type: :development
482
+ prerelease: false
483
+ version_requirements: !ruby/object:Gem::Requirement
484
+ requirements:
485
+ - - '='
486
+ - !ruby/object:Gem::Version
487
+ version: 7.1.3
488
+ - !ruby/object:Gem::Dependency
489
+ name: zip-merge
490
+ requirement: !ruby/object:Gem::Requirement
491
+ requirements:
492
+ - - '='
493
+ - !ruby/object:Gem::Version
494
+ version: 7.1.3
495
+ type: :development
496
+ prerelease: false
497
+ version_requirements: !ruby/object:Gem::Requirement
498
+ requirements:
499
+ - - '='
500
+ - !ruby/object:Gem::Version
501
+ version: 7.1.3
236
502
  - !ruby/object:Gem::Dependency
237
503
  name: ruby-progressbar
238
504
  requirement: !ruby/object:Gem::Requirement
@@ -287,18 +553,21 @@ dependencies:
287
553
  - - ">="
288
554
  - !ruby/object:Gem::Version
289
555
  version: 2.0.11
290
- description: "☯️ Git-specific merge3 contracts and conflict classification over ast-merge
291
- primitives."
556
+ description: "☯️ Git protocol adaptation and provider dispatch over ast-merge primitives."
292
557
  email:
293
558
  - floss@galtzo.com
294
- executables: []
559
+ executables:
560
+ - ast-merge-git
295
561
  extensions: []
296
562
  extra_rdoc_files: []
297
563
  files:
298
564
  - LICENSE.md
299
565
  - README.md
566
+ - exe/ast-merge-git
300
567
  - lib/ast-merge-git.rb
301
568
  - lib/ast/merge/git.rb
569
+ - lib/ast/merge/git/corpus.rb
570
+ - lib/ast/merge/git/local_benchmark.rb
302
571
  - lib/ast/merge/git/version.rb
303
572
  - sig/ast/merge/git.rbs
304
573
  homepage: https://github.com/structuredmerge/structuredmerge-ruby
@@ -307,10 +576,10 @@ licenses:
307
576
  - PolyForm-Small-Business-1.0.0
308
577
  metadata:
309
578
  homepage_uri: https://structuredmerge.org
310
- source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.1
311
- changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.1/CHANGELOG.md
579
+ source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.3
580
+ changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.3/CHANGELOG.md
312
581
  bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
313
- documentation_uri: https://www.rubydoc.info/gems/ast-merge-git/7.1.1
582
+ documentation_uri: https://www.rubydoc.info/gems/ast-merge-git/7.1.3
314
583
  funding_uri: https://github.com/sponsors/pboling
315
584
  wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
316
585
  news_uri: https://www.railsbling.com/tags/ast-merge-git
@@ -319,7 +588,7 @@ metadata:
319
588
  rubygems_mfa_required: 'true'
320
589
  rdoc_options:
321
590
  - "--title"
322
- - ast-merge-git - ☯️ Three-way git merge semantics for StructuredMerge
591
+ - ast-merge-git - ☯️ Format-neutral Git merge-driver adapter for StructuredMerge
323
592
  - "--main"
324
593
  - README.md
325
594
  - "--exclude"
@@ -342,5 +611,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
342
611
  requirements: []
343
612
  rubygems_version: 4.0.17
344
613
  specification_version: 4
345
- summary: "☯️ Three-way git merge semantics for StructuredMerge"
614
+ summary: "☯️ Format-neutral Git merge-driver adapter for StructuredMerge"
346
615
  test_files: []
metadata.gz.sig CHANGED
Binary file