ast-merge-git 7.1.10 → 7.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fd20591b0e3de1b3a8c6765f85cdedc5d3f19fea69e1be9d6490d50af756a54
-  data.tar.gz: 92b8bbab49809926e97922d7092992ac1c54f1e82bd15f0af1b9e0a0f52d0aea
+  metadata.gz: 4523854d5bb3c19256845209060f29dd85579a7e56f590402dc7c24d7f5a7926
+  data.tar.gz: 7e53123a47e09df9f904a54caae63915af8225d44dbe01646d32850e5aff2b55
 SHA512:
-  metadata.gz: 21e177752270944833a9a50e1fc3845614db43959949b7abdfc46ea3b6b7b840e8c4c1c8d46405d7b7d3299a9f309f8df29060ed133ab093bee5a81f3e324200
-  data.tar.gz: 21caa075844f315ce7aa7f51a700328ac5f86cb6e03a3bbaa0a18a3e5c945910b4d7548c7253e49b82f93323eb82adc1902bce034a469380c455d3feba152210
+  metadata.gz: 0d6e7c302452e7d610b4fd7f000cc376cf0fc176d2805777c9b459d6c38d00814df8abe7e6cb48f614b7f138491c618bf05a738466d72512e018f869638aeb8e
+  data.tar.gz: b581d05bb7d63e9cd2899207dc3a5d4119e4e9a89fc9491c08b86d81fb1b1e45b506afbda1213c171cad9cfcd10c1cffafbbc6f1d305058a21bc8b06af498a85

data/lib/ast/merge/git/micro_benchmark_check.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module Ast
+  module Merge
+    module Git
+      # Verifies the paired-drivers micro benchmark invariants outside the spec
+      # suite. Runs the real benchmark machinery (installed driver, real merge
+      # cases), so it is only invoked by the explicit `benchmark:micro` rake
+      # task — never by RSpec. See rakelib/benchmark_micro.rake.
+      class MicroBenchmarkCheck
+        # ok: true when every invariant held; checks: name => true/String(failure detail)
+        Result = Struct.new(:ok, :checks, keyword_init: true)
+
+        CONFLICT_CASE = 'case.merge3.json.independent-fields.v1'
+        OWNER_CONFLICT_CASE = 'case.merge3.json.same-owner-conflict.v1'
+        MALFORMED_CASE = 'case.merge3.json.malformed-ours.v1'
+
+        # @param runner [#run] an Ast::Merge::Git::LocalBenchmarkRunner
+        # @param options [Hash] reserved for forward compatibility
+        def initialize(runner, **options)
+          @runner = runner
+          @options = options
+        end
+
+        # Builds a runner from explicit paths and verifies the invariants.
+        #
+        # @param corpus_path [String, Pathname] benchmark corpus JSON
+        # @param driver_path [String, Pathname] installed ast-merge-git driver
+        # @param tmp_root [String, Pathname] scratch directory for runs
+        # @param options [Hash] reserved for forward compatibility
+        def self.call(corpus_path:, driver_path:, tmp_root:, **options)
+          runner = LocalBenchmarkRunner.new(
+            benchmark: LocalBenchmark.load(corpus_path),
+            driver_path: driver_path,
+            tmp_root: tmp_root
+          )
+          new(runner, **options).verify
+        end
+
+        # Runs the micro profile (twice, for cache-identity stability) and
+        # checks the safety invariants. Never raises for a failed invariant —
+        # failures are reported through the returned Result.
+        #
+        # @return [Result]
+        def verify
+          cwd_before = Dir.pwd
+          runs = Array.new(2) { @runner.run(profile: 'micro') }
+          checks = invariant_checks(runs, cwd_before)
+          Result.new(ok: checks.values.all?(true), checks: checks)
+        rescue LocalBenchmark::Error => e
+          Result.new(ok: false, checks: { 'benchmark run' => e.message })
+        end
+
+        private
+
+        def invariant_checks(runs, cwd_before)
+          {
+            'git text conflict becomes a structurally verified clean candidate' =>
+              conflict_check(runs.first),
+            'intentional-conflict safety and malformed-input rejection preserved' =>
+              safety_check(runs.first),
+            'cwd preserved, JSON-serializable, stable cache identity' =>
+              stability_check(runs, cwd_before)
+          }
+        end
+
+        def conflict_check(run)
+          results = results_for(run, CONFLICT_CASE)
+          last = results.last
+          outcomes(results) == %w[false_conflict correct_clean] &&
+            last.dig('checks', 'parse_validity_only_accepted') == false &&
+            last.dig('checks', 'acceptable') == true &&
+            last.fetch('deterministic_correctness_rerun') == true
+        rescue StandardError
+          false
+        end
+
+        def safety_check(run)
+          conflict = results_for(run, OWNER_CONFLICT_CASE)
+          malformed = results_for(run, MALFORMED_CASE).last
+          outcomes(conflict) == %w[true_conflict true_conflict] &&
+            malformed['outcome'] == 'correct_clean' &&
+            messages_of(malformed).include?('ours parse error')
+        rescue StandardError
+          false
+        end
+
+        def stability_check(runs, cwd_before)
+          first = runs.first
+          last = runs.last
+          Dir.pwd == cwd_before &&
+            first.dig('cache_identity', 'sha256') == last.dig('cache_identity', 'sha256') &&
+            !JSON.generate(first).nil?
+        rescue StandardError
+          false
+        end
+
+        def results_for(run, case_id)
+          run.fetch('results').select { |item| item['case_id'] == case_id }
+        end
+
+        def outcomes(records)
+          records.map { |item| item['outcome'] }
+        end
+
+        def messages_of(record)
+          record.fetch('diagnostics').map { |item| item['message'] }.join
+        end
+      end
+    end
+  end
+end

data/lib/ast/merge/git/version.rb

@@ -6,7 +6,7 @@ module Ast
       # Version namespace for this gem.
       module Version
         # Current gem version.
-        VERSION = '7.1.10'
+        VERSION = '7.1.12'
       end
       # Current gem version exposed at the traditional constant location.
       VERSION = Version::VERSION # Traditional Constant Location

data/lib/ast/merge/git.rb

@@ -13,6 +13,8 @@ module Ast
     module Git
       PACKAGE_NAME = 'ast-merge-git'
       autoload :RustHostProvider, 'ast/merge/git/rust_host_provider'
+      # Dev-only benchmark verification; loaded by the benchmark:micro rake task.
+      autoload :MicroBenchmarkCheck, 'ast/merge/git/micro_benchmark_check'
       EXIT_SUCCESS = 0
       EXIT_CONFLICT = 1
       EXIT_ERROR = 2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ast-merge-git
 version: !ruby/object:Gem::Version
-  version: 7.1.10
+  version: 7.1.12
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.10
+        version: 7.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.10
+        version: 7.1.12
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.10
+        version: 7.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.10
+        version: 7.1.12
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -303,6 +303,7 @@ files:
 - lib/ast/merge/git/benchmark_adapter.rb
 - lib/ast/merge/git/corpus.rb
 - lib/ast/merge/git/local_benchmark.rb
+- lib/ast/merge/git/micro_benchmark_check.rb
 - lib/ast/merge/git/rust_host_provider.rb
 - lib/ast/merge/git/version.rb
 - sig/ast/merge/git.rbs
@@ -312,10 +313,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.10
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.10/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.12
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.12/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/ast-merge-git/7.1.10
+  documentation_uri: https://www.rubydoc.info/gems/ast-merge-git/7.1.12
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/ast-merge-git