ast-merge-git 7.1.1 → 7.1.4

data/sig/ast/merge/git.rbs

@@ -5,6 +5,112 @@ module Ast
         VERSION: String
       end
       VERSION: String
+
+      PACKAGE_NAME: String
+      EXIT_SUCCESS: Integer
+      EXIT_CONFLICT: Integer
+      EXIT_ERROR: Integer
+      CONFLICT_POLICIES: Array[Symbol]
+      ADAPTER_ERROR_CATEGORIES: Array[Symbol]
+
+      def self.merge3: (Hash[Symbol | String, untyped] request) -> Hash[Symbol, untyped]
+      def self.merge_files: (
+        base_path: String | Pathname,
+        ours_path: String | Pathname,
+        theirs_path: String | Pathname,
+        ?conflict_policy: Symbol | String,
+        **untyped
+      ) -> Hash[Symbol, untyped]
+      def self.run: (Array[String] argv, ?env: Hash[String, String], ?stderr: IO) -> Integer
+      def self.git_exit_code: (Hash[Symbol, untyped] result) -> Integer
+
+      class Corpus
+        class Error < StandardError
+        end
+
+        CLASSIFICATIONS: Array[String]
+        BACKLOG_STATUSES: Array[String]
+        SHA_PATTERN: Regexp
+        REQUIRED_CASE_KEYS: Array[String]
+
+        attr_reader manifest: Hash[String, untyped]
+
+        def self.load: (String path) -> Corpus
+        def initialize: (Hash[String, untyped] manifest) -> void
+        def validate!: () -> true
+        def cases: (?String? case_id) -> Array[Hash[String, untyped]]
+      end
+
+      class CorpusRunner
+        DEFAULT_TIMEOUT: Integer
+        OUTCOMES: Array[String]
+
+        def initialize: (
+          corpus: Corpus,
+          repository: String | Pathname,
+          driver_path: String | Pathname,
+          tmp_root: String | Pathname,
+          ?timeout: Integer
+        ) -> void
+        def run: (?case_id: String?) -> Array[Hash[Symbol, untyped]]
+      end
+
+      class CorpusAcquirer
+        def self.acquire: (
+          corpus: Corpus,
+          destination: String | Pathname,
+          tmp_root: String | Pathname
+        ) -> Pathname
+      end
+
+      class LocalBenchmark
+        class Error < StandardError
+        end
+
+        SCHEMA: String
+        CASE_SCHEMA: String
+        OPERATIONS: Array[String]
+        PARTITIONS: Array[String]
+        EXPECTATIONS: Array[String]
+        SEVERITIES: Array[String]
+        PRESERVATION: Array[String]
+        TRANSFORMATIONS: Array[String]
+        ID_PATTERN: Regexp
+        PROVENANCE_FIELDS: Array[String]
+        SELECTOR_FIELDS: Array[String]
+        INPUT_ROLES: Hash[String, Array[String]]
+
+        attr_reader document: Hash[String, untyped]
+        attr_reader corpus_digest: String
+        attr_reader path: Pathname?
+
+        def self.load: (String | Pathname path) -> LocalBenchmark
+        def initialize: (Hash[String, untyped] document, ?path: (String | Pathname)?, ?corpus_digest: String?) -> void
+        def validate!: () -> true
+        def cases: () -> Array[Hash[String, untyped]]
+        def select: (profile: String | Symbol, ?changed_paths: Array[String]) -> Hash[String, untyped]
+        def case_by_id: (String id) -> Hash[String, untyped]
+      end
+
+      class LocalBenchmarkRunner
+        DEFAULT_TIMEOUT: Integer
+
+        def initialize: (
+          benchmark: LocalBenchmark,
+          driver_path: String | Pathname,
+          tmp_root: String | Pathname,
+          ?timeout: Integer
+        ) -> void
+        def run: (profile: String | Symbol, ?changed_paths: Array[String]) -> Hash[String, untyped]
+      end
+
+      class LocalBenchmarkReport
+        SUCCESS: Array[String]
+
+        def self.build: (Hash[String, untyped] run) -> Hash[String, untyped]
+        def initialize: (Hash[String, untyped] run) -> void
+        def build: () -> Hash[String, untyped]
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ast-merge-git
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
-- !ruby/object:Gem::Dependency
-  name: json-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -91,20 +77,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.17
+        version: 3.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.17
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +168,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -192,7 +178,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +188,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.0.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -212,7 +198,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.0.20
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +208,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -232,7 +218,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +262,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -286,19 +272,22 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
-description: "☯️ Git-specific merge3 contracts and conflict classification over ast-merge
-  primitives."
+        version: 2.0.12
+description: "☯️ Git protocol adaptation and provider dispatch over ast-merge primitives."
 email:
 - floss@galtzo.com
-executables: []
+executables:
+- ast-merge-git
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.md
 - README.md
+- exe/ast-merge-git
 - lib/ast-merge-git.rb
 - lib/ast/merge/git.rb
+- lib/ast/merge/git/corpus.rb
+- lib/ast/merge/git/local_benchmark.rb
 - lib/ast/merge/git/version.rb
 - sig/ast/merge/git.rbs
 homepage: https://github.com/structuredmerge/structuredmerge-ruby
@@ -307,10 +296,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.1
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.1/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.4
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.4/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/ast-merge-git/7.1.1
+  documentation_uri: https://www.rubydoc.info/gems/ast-merge-git/7.1.4
   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
@@ -319,7 +308,7 @@ metadata:
   rubygems_mfa_required: 'true'
 rdoc_options:
 - "--title"
-- ast-merge-git - ☯️ Three-way git merge semantics for StructuredMerge
+- ast-merge-git - ☯️ Format-neutral Git merge-driver adapter for StructuredMerge
 - "--main"
 - README.md
 - "--exclude"
@@ -342,5 +331,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 4.0.17
 specification_version: 4
-summary: "☯️ Three-way git merge semantics for StructuredMerge"
+summary: "☯️ Format-neutral Git merge-driver adapter for StructuredMerge"
 test_files: []

metadata.gz.sig

@@ -1,2 +1,3 @@
-Z�˴�
-���"�t�d�4/�F�Ek�e#4�05�*����t8�ۍ����� ʢ��������K �!2R�k�i�}�vH��@���hCKX\!��'��Ԫ~�9�<<B��Snb�Y��G�B�rȒ*�-�ެ�-�)gܧ�n�d����B��|}�SMw��Jg�d�ܽ���	�(�u��:�)���z&�b4��H��;>�B��,�Å1,�\��A��{���,4��"�)֐����U���p�hP������g��XvQ���r��1%RU��Rx���6Y<oB� �m-�Y�nK��vDg~^�l�R�{���T5�������[����'�|�乸��s���&�,Ѹ2��aaOn3�_����'(T��3
+�q���ʒL<���X ���Ư�c
+&q,6¢_��GhU�����Ύnqk�k�&Vm�2���3w��:�|!Q�8Hb]ӹzZ�6V���tH��A�dd�UUGG��\����c�$&_��rޙ4�N�qv"(�L+���������~���3��\�c�`t�r	�J��){
+ԂM#��/<
%�	|���1�]?v%q(@��s�Ro	!�����pc��/b$��`��	0X�R�5RhE!�A�;,� �h�O���H����%�1���Z'ǣt�*N�ъ�#0��BޮVa[�xv̼�s���Q?���r���