RubyGems - ruby-merge - Versions diffs - 7.1.7 → 7.1.8 - Mend

ruby-merge 7.1.7 → 7.1.8

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 (8) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fe81963d8a127dc0c316c3db4954c5fa83122a97461bee2e40b65d51640c556
-  data.tar.gz: b9ebdf14cfc5ecfe2f099403d88419aa736cd076c93837c6cc440710f35fb54c
+  metadata.gz: 3ad386abb55c17bd12f237caa2346764e139be3b41b7eac8ffddadaf3175d900
+  data.tar.gz: 7a5ab555bc1666ab70647e9bac922e18467deac2fb89aca5c8b8ceaab27b9665
 SHA512:
-  metadata.gz: dc1bc8f1d760efb7359eb0c9b47c9949afce1f7d4235fd474c8082b6beea9824ab813c0b3dc48a344a59eb0f7cf9191c83121454dc442c922ac5258936b99014
-  data.tar.gz: 86b6e8f5e072ebbc338a33008f3f56d4ea4d9df1e73695498c9190d13ca865af63fd0d63e313657e6cbc77bea9c657d174e1243f0ff822cea20bf249fa23bec1
+  metadata.gz: ec65095a788ce87f2fdc8c5deb489030170ce937d41fc473ee1f53ce5778c5ff63094efc1d3299c26e0603f2814d4baea2cffc5e58c4972ddf715f8c09e7a7a2
+  data.tar.gz: bd9b63295946ebedd81a2803e5efd0a99b0bbb33b4d26ec070f6d509347bf38949071252be823e7f08e653dfdd56e4eaab523f338dc54b18aad0dd2571e409a8

checksums.yaml.gz.sig CHANGED Viewed

Binary file

data/lib/ruby/merge/provider.rb ADDED Viewed

@@ -0,0 +1,238 @@
+# frozen_string_literal: true
+module Ruby
+  # Ruby workflow provider integration.
+  module Merge
+    # Tree-sitter workflow provider backed by the shared Ruby substrate.
+    # rubocop:disable Metrics/AbcSize, Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/ParameterLists, Metrics/PerceivedComplexity -- provider operations keep request, rendering, and result-envelope logic together
+    class Provider
+      DEFAULT_PROFILE = :source_preserving
+      TREE_SITTER_BACKENDS = [
+        *TreeHaver::NATIVE_BACKENDS,
+        :tslp,
+        :'kreuzberg-language-pack'
+      ].freeze
+      def provider_id = 'ruby.ruby'
+      def family = 'ruby'
+      def capabilities
+        {
+          operations: Ast::Merge::ProviderContract::OPERATIONS,
+          dialects: %i[ruby],
+          backends: TREE_SITTER_BACKENDS,
+          profiles: [DEFAULT_PROFILE],
+          role: :workflow,
+          parser_requirements: {
+            allowed_backend_families: ['tree-sitter'],
+            denied_backend_ids: ['prism'],
+            required_capabilities: %w[normalized-nodes exact-byte-spans]
+          },
+          source_preservation: %i[exact_source owner_fragments line_provenance reparse]
+        }.freeze
+      end
+      def analyze(request)
+        parsed = parse_source(request.fetch(:source), request)
+        return parse_failure(:analyze, :source, parsed, request) unless parsed[:ok]
+        result(
+          :analyze,
+          request,
+          analysis: parsed.fetch(:analysis),
+          verification: { source_parsed: true }
+        )
+      end
+      def diff2(request)
+        before = parse_source(request.fetch(:before_source), request)
+        return parse_failure(:diff2, :before, before, request) unless before[:ok]
+        after = parse_source(request.fetch(:after_source), request)
+        return parse_failure(:diff2, :after, after, request) unless after[:ok]
+        changes = owner_changes(
+          request.fetch(:before_source),
+          request.fetch(:after_source)
+        )
+        result(
+          :diff2,
+          request,
+          diff: { changes: changes },
+          changes: changes,
+          verification: { before_parsed: true, after_parsed: true }
+        )
+      end
+      def merge2(request)
+        merged = Ruby::Merge.merge_ruby(
+          request.fetch(:incoming_source),
+          request.fetch(:current_source),
+          'ruby',
+          backend: request[:backend]
+        )
+        return substrate_failure(:merge2, merged, request) unless merged[:ok]
+        output = merged.fetch(:output)
+        verified = parse_source(output, request)
+        return parse_failure(:merge2, :output, verified, request, category: :render_failure) unless verified[:ok]
+        result(
+          :merge2,
+          request,
+          output: output,
+          render_report: { strategy: :ruby_substrate, synthesis: :family_emission },
+          verification: { output_reparsed: true }
+        )
+      end
+      def merge3(request)
+        parsed = %i[base ours theirs].to_h do |role|
+          result = parse_source(request.fetch(:"#{role}_source"), request)
+          return parse_failure(:merge3, role, result, request) unless result[:ok]
+          [role, result]
+        end
+        winner = exact_revision_role(request)
+        unless winner
+          return failure(
+            :merge3,
+            request,
+            category: :unsupported_capability,
+            message: 'ruby-merge has not proven composite three-way merging for tree-sitter runtimes.',
+            verification: { base_participated: true }
+          )
+        end
+        output = request.fetch(:"#{winner}_source")
+        result(
+          :merge3,
+          request,
+          output: output,
+          render_report: { strategy: :exact_revision, source_role: winner },
+          verification: {
+            base_participated: true,
+            output_reparsed: parsed.fetch(winner)[:ok],
+            byte_exact: true,
+            source_role: winner
+          }
+        )
+      end
+      private
+      def parse_source(source, request)
+        Ruby::Merge.parse_ruby(source, 'ruby', backend: request[:backend])
+      end
+      def owner_changes(before_source, after_source)
+        before = Ruby::Merge.ruby_source_owner_identity_profile(before_source)
+        after = Ruby::Merge.ruby_source_owner_identity_profile(after_source)
+        before_by_identity = before.to_h { |owner| [owner[:structural_identity], owner] }
+        after_by_identity = after.to_h { |owner| [owner[:structural_identity], owner] }
+        [*before_by_identity.keys, *after_by_identity.keys].uniq.filter_map do |identity|
+          left = before_by_identity[identity]
+          right = after_by_identity[identity]
+          next if left == right
+          {
+            path: right&.fetch(:address) || left.fetch(:address),
+            before: left ? :present : :absent,
+            after: right ? :present : :absent,
+            change: if left.nil?
+                      :added
+                    elsif right.nil?
+                      :deleted
+                    else
+                      :edited
+                    end
+          }.freeze
+        end.freeze
+      end
+      def exact_revision_role(request)
+        base = request.fetch(:base_source)
+        ours = request.fetch(:ours_source)
+        theirs = request.fetch(:theirs_source)
+        return :ours if ours == theirs || base == theirs
+        :theirs if base == ours
+      end
+      def parse_failure(operation, role, parsed, request, category: :parse_error)
+        diagnostic = Array(parsed[:diagnostics]).first || {}
+        failure(
+          operation,
+          request,
+          category: category,
+          message: "#{role} parse error: #{diagnostic[:message] || 'Ruby parse failed'}",
+          source_role: role,
+          verification: operation == :merge3 ? { base_participated: true } : {}
+        )
+      end
+      def substrate_failure(operation, merged, request)
+        diagnostic = Array(merged[:diagnostics]).first || {}
+        failure(
+          operation,
+          request,
+          category: (diagnostic[:category] || :merge_failure).to_sym,
+          message: diagnostic[:message] || 'Ruby substrate merge failed.'
+        )
+      end
+      def result(operation, request, changes: [], diagnostics: [], render_report: {}, verification: {}, **payload)
+        Ast::Merge::ProviderResult.build(
+          operation: operation,
+          success: true,
+          envelope: envelope(
+            request,
+            changes: changes,
+            diagnostics: diagnostics,
+            render_report: render_report,
+            verification: verification
+          ),
+          **payload
+        )
+      end
+      def failure(operation, request, category:, message:, verification: {}, **payload)
+        Ast::Merge::ProviderResult.build(
+          operation: operation,
+          success: false,
+          envelope: envelope(
+            request,
+            diagnostics: [{ category: category, severity: :error, message: message, blocking: true }],
+            verification: verification
+          ),
+          **payload
+        )
+      end
+      def envelope(request, **fields)
+        {
+          provider: {
+            provider_id: provider_id,
+            family: family,
+            dialect: request[:dialect] || :ruby,
+            backend: request[:backend] || :'kreuzberg-language-pack',
+            package: Ruby::Merge::PACKAGE_NAME,
+            package_version: Ruby::Merge::Version::VERSION
+          },
+          profile: { profile_id: request[:profile_id] || DEFAULT_PROFILE }
+        }.merge(fields)
+      end
+    end
+    # rubocop:enable Metrics/AbcSize, Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/ParameterLists, Metrics/PerceivedComplexity
+    class << self
+      def merge_provider
+        @merge_provider ||= Provider.new
+      end
+      def register_provider!(replace: false)
+        Ast::Merge.register_provider(merge_provider, replace: replace)
+      end
+    end
+  end
+end

data/lib/ruby/merge/version.rb CHANGED Viewed

@@ -5,7 +5,7 @@ module Ruby
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = '7.1.7'
+      VERSION = '7.1.8'
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/ruby/merge.rb CHANGED Viewed

@@ -24,7 +24,7 @@ module Ruby
   # those phases to satisfy generic size metrics would obscure the contract
   # they implement and make provider behavior harder to audit.
   # rubocop:disable Metrics/AbcSize, Metrics/BlockLength, Metrics/BlockNesting
-  # rubocop:disable Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/MethodLength
+  # rubocop:disable Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/ParameterLists
   # rubocop:disable Metrics/ModuleLength, Metrics/PerceivedComplexity
   # rubocop:disable Style/MultilineBlockChain
   module Merge
@@ -236,14 +236,14 @@ module Ruby
       ).to_h
     end
-    def merge_ruby(template_source, destination_source, dialect, merge_template_requires: false,
+    def merge_ruby(template_source, destination_source, dialect, backend: nil, merge_template_requires: false,
                    method_move_policy: DEFAULT_METHOD_MOVE_POLICY)
-      template = parse_ruby(template_source, dialect)
+      template = parse_ruby(template_source, dialect, backend: backend)
       return template unless template[:ok]
       method_move_policy = normalize_method_move_policy(method_move_policy)
-      destination = parse_ruby(destination_source, dialect)
+      destination = parse_ruby(destination_source, dialect, backend: backend)
       unless destination[:ok]
         return {
           ok: false,
@@ -3212,12 +3212,15 @@ module Ruby
     )
     # rubocop:enable Style/MultilineBlockChain
     # rubocop:enable Metrics/ModuleLength, Metrics/PerceivedComplexity
-    # rubocop:enable Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/MethodLength
+    # rubocop:enable Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/ParameterLists
     # rubocop:enable Metrics/AbcSize, Metrics/BlockLength, Metrics/BlockNesting
   end
 end
+require_relative 'merge/provider'
 Ruby::Merge.register_backend!
+Ruby::Merge.register_provider!
 TreeHaver::BackendRegistry.register_tag(
   :tslp_ruby_import_records,

data.tar.gz.sig CHANGED Viewed

Binary file

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.7
+  version: 7.1.8
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.7
+        version: 7.1.8
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.17
+        version: 3.0.31
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
         version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.17
+        version: 3.0.31
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -232,7 +232,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.7
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -306,6 +306,7 @@ files:
 - lib/ruby/merge/method_similarity.rb
 - lib/ruby/merge/nocov_node_base.rb
 - lib/ruby/merge/nocov_wrapper_base.rb
+- lib/ruby/merge/provider.rb
 - lib/ruby/merge/rescue_semantics.rb
 - lib/ruby/merge/scaffold_chunk_support.rb
 - lib/ruby/merge/signature_support.rb
@@ -317,10 +318,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.7
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.7/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.8
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.8/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/ruby-merge/7.1.7
+  documentation_uri: https://www.rubydoc.info/gems/ruby-merge/7.1.8
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/ruby-merge

metadata.gz.sig CHANGED Viewed

Binary file