ast-merge-git 7.1.1 → 7.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6527f8c9a9e11a701a0650d6b6eb473c2182368ca1bef5338392ad332461911a
-  data.tar.gz: d8b813c4d98258a2ed46b016a943e350271b13a5f17d31f13733dea638fccc6f
+  metadata.gz: be709f99d89a6dc5a6245b53d676a1d6136b64574724cfedada249935de9557b
+  data.tar.gz: dff9b5168e5dd8cac4af0c4a7510726db3038d389f2c0212df27a4954d67fcb1
 SHA512:
-  metadata.gz: 8bc8b1aea1fbc0d857a6ce20280b28e634717a1ada45db509a1443ad6465776cb04be45d0c33b5d893a61ff8701dbab48196d67038c46ec4edee41d887329474
-  data.tar.gz: db7093c64f37155685bdac5ae5b8fdc5120d51a5b1f154bef1bf05badb5a00c721a8bcef9205fed399dae76fc2bcbeb707d749c9c3a67ad122a3d06d724bd9c8
+  metadata.gz: dd3ccddce030b00948006e96a5c6029fda6d6ee7dab5f9af91bc24a4e361149a5e476ddaa5d45277bb981b593995e8d1135ce70c4d5b672cd5c799cd12078225
+  data.tar.gz: 431a3ab1a6fa2eb04521bbd5a3b99e7b4a786dc5d121de937aa0c5448bd882906c6cfcf013e520ce105bce587144c84dfbebab9475abd8e9d293eafde840329a

data/README.md

@@ -26,7 +26,7 @@ I've summarized my thoughts in [this blog post](https://dev.to/galtzo/hostile-ta
 ### Key Features
 
 - Git-oriented request and response shaping for three-way merge driver integrations.
-- Family detection from path, extension, and configured merge behavior.
+- Provider selection from explicit family/provider, dialect, backend, and profile selectors.
 - JSON-compatible reports that can be logged, inspected, or replayed by higher-level tooling.
 - Fallback-friendly behavior for unsupported families or unsafe parser results.
 
@@ -45,7 +45,7 @@ I've summarized my thoughts in [this blog post](https://dev.to/galtzo/hostile-ta
 
 ### Compatibility
 
-Compatible with MRI Ruby 4.0.0+, and concordant releases of JRuby, and TruffleRuby.
+Compatible with MRI Ruby 4.0.0+, JRuby, and TruffleRuby.
 CI workflows and Appraisals are generated for MRI Ruby 4.0.0+.
 This test floor is configured by `ruby.test_minimum` in `.kettle-jem.yml` and
 may be higher than the gem's runtime compatibility floor when legacy Rubies are
@@ -87,17 +87,29 @@ gem install ast-merge-git
 
 ## ⚙️ Configuration
 
-Configure `ast-merge-git` through the repository's Git attributes and StructuredMerge family settings. The gem expects callers to provide the ancestor, current, and incoming file contents that Git passes to a custom merge driver.
+Configure `ast-merge-git` through the repository's Git attributes and StructuredMerge provider settings. The gem expects callers to provide the ancestor, current, and incoming file contents that Git passes to a custom merge driver.
 
 Keep family-specific parser configuration in the corresponding merge gem. For example, Markdown backend choices belong to `markdown-merge` or its provider gems, while Ruby source backend choices belong to `ruby-merge` or `prism-merge`.
 
+The executable does not infer or require family implementations. Configure
+`AST_MERGE_REQUIRE` with comma-separated provider require paths and select a
+provider with `AST_MERGE_FAMILY` or `AST_MERGE_PROVIDER`. Optional selectors are
+`AST_MERGE_DIALECT`, `AST_MERGE_BACKEND`, and `AST_MERGE_PROFILE`.
+
+```ini
+[merge "structured-json"]
+  name = StructuredMerge JSON-family driver
+  driver = AST_MERGE_REQUIRE=json/merge AST_MERGE_FAMILY=json AST_MERGE_DIALECT=json ast-merge-git %O %A %B %P %L
+```
+
 ## 🔧 Basic Usage
 
 ```ruby
 require "ast/merge/git"
+require "json/merge"
 
 result = Ast::Merge::Git.merge3(
-  language: "json",
+  family: "json",
   dialect: "json",
   base_source: File.binread("%O"),
   ours_source: File.binread("%A"),
@@ -112,6 +124,12 @@ else
 end
 ```
 
+For direct Git-driver execution, `ast-merge-git` writes clean provider output to
+`%A` and exits `0`. Unresolved conflicts exit `1`; unsupported capabilities,
+invalid provider output, configuration failures, and file errors exit `2`.
+`AST_MERGE_CONFLICT_POLICY=leave_ours` prevents conflicted output from replacing
+`%A`; the default `write` policy writes provider conflict output when available.
+
 ## 🔐 Security
 
 See [SECURITY.md][🔐security].
@@ -119,20 +137,12 @@ See [SECURITY.md][🔐security].
 ## 🤝 Contributing
 
 If you need some ideas of where to help, you could work on adding more code coverage,
-or if it is already 💯 (see [below](#code-coverage)) check [issues][🤝gh-issues] or [PRs][🤝gh-pulls],
-or use the gem and think about how it could be better.
+check [issues][🤝gh-issues] or [PRs][🤝gh-pulls], or use the gem and think about how it could be better.
 
 We [![Keep A Changelog][📗keep-changelog-img]][📗keep-changelog] so if you make changes, remember to update it.
 
 See [CONTRIBUTING.md][🤝contributing] for more detailed instructions.
 
-### Code Coverage
-
-<details markdown="1">
-<summary>Coverage service badges</summary>
-
-</details>
-
 ## 📌 Versioning
 
 This library follows [![Semantic Versioning 2.0.0][📌semver-img]][📌semver] for its public API where practical.
@@ -272,7 +282,7 @@ If none of the available licenses suit your use case, please [contact us](mailto
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.163-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-1.022-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/exe/ast-merge-git

@@ -0,0 +1,149 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'ast/merge/git'
+
+if ARGV.first == 'benchmark-provider-diff'
+  require 'json'
+
+  begin
+    before_path, after_path, path_name = ARGV.drop(1)
+    raise ArgumentError, 'before, after, and path name are required' unless before_path && after_path && path_name
+
+    require ENV.fetch('AST_MERGE_REQUIRE')
+    result = Ast::Merge.dispatch_provider(
+      :diff2,
+      {
+        provider_id: ENV.fetch('AST_MERGE_PROVIDER'),
+        family: ENV.fetch('AST_MERGE_FAMILY'),
+        dialect: ENV.fetch('AST_MERGE_DIALECT'),
+        backend: ENV.fetch('AST_MERGE_BACKEND'),
+        profile_id: ENV.fetch('AST_MERGE_PROFILE'),
+        before_source: File.binread(before_path),
+        after_source: File.binread(after_path),
+        path_name: path_name
+      }
+    )
+    puts JSON.generate(Ast::Merge.json_ready(result))
+    exit(result[:ok] == true ? 0 : 2)
+  rescue ArgumentError, Ast::Merge::Error, KeyError, LoadError, SystemCallError => e
+    warn "ast-merge-git benchmark-provider-diff: #{e.message}"
+    exit 2
+  end
+end
+
+if ARGV.first == 'benchmark'
+  require 'json'
+  require 'optparse'
+
+  command = ARGV.fetch(1, 'help')
+  options = {
+    profile: 'micro',
+    changed_paths: [],
+    tmp_root: File.expand_path('../tmp/benchmark', __dir__),
+    timeout: 30
+  }
+  parser = OptionParser.new do |opts|
+    opts.banner = 'usage: ast-merge-git benchmark validate|select|run|report [options]'
+    opts.on('--corpus PATH') { |value| options[:corpus] = value }
+    opts.on('--profile PROFILE') { |value| options[:profile] = value }
+    opts.on('--changed-path PATH') { |value| options[:changed_paths] << value }
+    opts.on('--driver PATH') { |value| options[:driver] = value }
+    opts.on('--mergiraf PATH') { |value| options[:mergiraf] = value }
+    opts.on('--tmp-root PATH') { |value| options[:tmp_root] = value }
+    opts.on('--timeout SECONDS', Integer) { |value| options[:timeout] = value }
+  end
+
+  begin
+    parser.parse!(ARGV.drop(2))
+    raise Ast::Merge::Git::LocalBenchmark::Error, '--corpus is required' unless options[:corpus]
+
+    benchmark = Ast::Merge::Git::LocalBenchmark.load(options[:corpus])
+    output = case command
+             when 'validate'
+               { schema_version: 1, valid: benchmark.validate!, corpus_id: benchmark.document['id'],
+                 corpus_digest: benchmark.corpus_digest, cases: benchmark.cases.length }
+             when 'select'
+               benchmark.select(profile: options[:profile], changed_paths: options[:changed_paths])
+             when 'run', 'report'
+               driver = options[:driver] || Gem.bin_path('ast-merge-git', 'ast-merge-git')
+               run = Ast::Merge::Git::LocalBenchmarkRunner.new(
+                 benchmark: benchmark,
+                 driver_path: driver,
+                 tmp_root: options[:tmp_root],
+                 timeout: options[:timeout],
+                 competitor_paths: options[:mergiraf] ? { 'mergiraf' => options[:mergiraf] } : {}
+               ).run(profile: options[:profile], changed_paths: options[:changed_paths])
+               command == 'report' ? Ast::Merge::Git::LocalBenchmarkReport.build(run) : run
+             else
+               warn parser
+               exit 2
+             end
+    puts JSON.generate(output)
+    exit 1 if command == 'report' && output['hard_gate_failed']
+  rescue Ast::Merge::Git::LocalBenchmark::Error, OptionParser::ParseError => e
+    warn "ast-merge-git benchmark: #{e.message}"
+    exit 2
+  end
+  exit 0
+end
+
+if ARGV.first == 'corpus'
+  require 'json'
+  require 'optparse'
+
+  command = ARGV.fetch(1, 'help')
+  options = { tmp_root: File.expand_path('../tmp/corpus', __dir__), timeout: 30 }
+  parser = OptionParser.new do |opts|
+    opts.banner = 'usage: ast-merge-git corpus validate|run|acquire [options]'
+    opts.on('--manifest PATH') { |value| options[:manifest] = value }
+    opts.on('--repository PATH') { |value| options[:repository] = value }
+    opts.on('--driver PATH') { |value| options[:driver] = value }
+    opts.on('--tmp-root PATH') { |value| options[:tmp_root] = value }
+    opts.on('--case ID') { |value| options[:case_id] = value }
+    opts.on('--destination PATH') { |value| options[:destination] = value }
+    opts.on('--timeout SECONDS', Integer) { |value| options[:timeout] = value }
+  end
+
+  begin
+    parser.parse!(ARGV.drop(2))
+    raise Ast::Merge::Git::Corpus::Error, '--manifest is required' unless options[:manifest]
+
+    corpus = Ast::Merge::Git::Corpus.load(options[:manifest])
+    case command
+    when 'validate'
+      corpus.validate!
+      puts JSON.generate(schema_version: 1, valid: true, cases: corpus.manifest.fetch('cases').length)
+    when 'acquire'
+      raise Ast::Merge::Git::Corpus::Error, '--destination is required' unless options[:destination]
+
+      path = Ast::Merge::Git::CorpusAcquirer.acquire(
+        corpus: corpus,
+        destination: options[:destination],
+        tmp_root: options[:tmp_root]
+      )
+      puts JSON.generate(schema_version: 1, repository: path.to_s, revision: corpus.manifest.dig('source', 'revision'))
+    when 'run'
+      raise Ast::Merge::Git::Corpus::Error, '--repository is required' unless options[:repository]
+
+      driver = options[:driver] || Gem.bin_path('ast-merge-git', 'ast-merge-git')
+      runner = Ast::Merge::Git::CorpusRunner.new(
+        corpus: corpus,
+        repository: options[:repository],
+        driver_path: driver,
+        tmp_root: options[:tmp_root],
+        timeout: options[:timeout]
+      )
+      puts JSON.generate(schema_version: 1, results: runner.run(case_id: options[:case_id]))
+    else
+      warn parser
+      exit 2
+    end
+  rescue Ast::Merge::Git::Corpus::Error, OptionParser::ParseError => e
+    warn "ast-merge-git corpus: #{e.message}"
+    exit 2
+  end
+  exit 0
+end
+
+exit Ast::Merge::Git.run(ARGV)