ast-merge 7.1.12 → 7.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80e7140a0ddb8ec0ae54489cf6d1ad56abc6dd87551771cddfa5a4d97bdf9d8c
-  data.tar.gz: e33e8171e7ed4f6ab0b4062dccf7c07f129efaade059aeb4f01e573ba68eb9ee
+  metadata.gz: ad016b2d5303860cde60c63a4f3aa25f4bb35faa93e2924c862d37c04d7f6461
+  data.tar.gz: 4bf2a8995227c3d6b2642c34fcbffe160736ee203e874331c78a3597124551a5
 SHA512:
-  metadata.gz: 8deac7120ad5ec98d8fdcdce26cabf1ed0e3724d3444c826e81f993f48d3a8d39bb1ebf853355893fd1d9bd95deb17d845e21d482730568a6eab3bdf3e22f3c9
-  data.tar.gz: c0dd9d6f40c2f4b3028afc2655429b11a5818ef9333a658a7455ce3385c5b56c73fd7dd1eeb5d096c4ad82289468da9f487844a656f1cdf0ab8c6aae7d537650
+  metadata.gz: cbd41051a3938fbf0631bc28aef7fd86ae88aefbdb961e9af2f17b76f081e6683d821d134824d8fd84c9c581f5c8cb82584bf8aae13ece9cd805c6bed83cbd39
+  data.tar.gz: 865e8aea5653ba1a2f412933299d0310db9f2425c15b692ea85967694c909392289ebfbaf88a974926fc1fc125e43f26053e93ec70703cae5bb39b6c1e1af62e

data/lib/ast/merge/rspec/shared_examples/provider_conformance.rb

@@ -2,6 +2,17 @@
 
 # rubocop:disable Metrics/BlockLength -- complete executable provider contract is intentionally shared
 RSpec.shared_examples 'Ast::Merge::ProviderConformance' do
+  def skip_for_tslp_backend
+    return unless %w[tslp kreuzberg-language-pack].include?(provider_conformance.fetch(:backend).to_s)
+
+    skip_for(
+      engine: 'ruby',
+      versions: 'head',
+      reason: 'Ruby head is permanently unsupported by ' \
+        "tree_sitter_language_pack's released-ABI-only native gem policy"
+    )
+  end
+
   let(:provider_capabilities) { provider.capabilities }
   let(:provider_selectors) do
     {
@@ -31,6 +42,7 @@ RSpec.shared_examples 'Ast::Merge::ProviderConformance' do
   end
 
   it 'executes every advertised operation with its required source roles' do
+    skip_for_tslp_backend
     provider_conformance.fetch(:requests).each do |operation, request|
       result = Ast::Merge.dispatch_provider(operation, provider_selectors.merge(request))
 
@@ -53,6 +65,7 @@ RSpec.shared_examples 'Ast::Merge::ProviderConformance' do
   end
 
   it 'reports a source-role parse diagnostic' do
+    skip_for_tslp_backend if provider_conformance[:invalid_merge3]
     if provider_conformance[:invalid_merge3]
       invalid = provider_conformance.fetch(:invalid_merge3)
       result = Ast::Merge.dispatch_provider(:merge3, provider_selectors.merge(invalid))
@@ -65,6 +78,7 @@ RSpec.shared_examples 'Ast::Merge::ProviderConformance' do
   end
 
   it 'uses the base in an adversarial merge3 that merge2 substitution gets wrong' do
+    skip_for_tslp_backend
     adversarial = provider_conformance.fetch(:base_adversarial_merge3)
     proof = Ast::Merge::RSpec::ProviderConformance.new(
       provider: provider,
@@ -80,6 +94,7 @@ RSpec.shared_examples 'Ast::Merge::ProviderConformance' do
   end
 
   it 'reports source preservation, synthesis, reparsing, and semantic verification' do
+    skip_for_tslp_backend if provider_conformance[:synthesized_merge3]
     if provider_conformance[:synthesized_merge3]
       synthesis = provider_conformance.fetch(:synthesized_merge3)
       result = Ast::Merge.dispatch_provider(:merge3, provider_selectors.merge(synthesis.fetch(:request)))

data/lib/ast/merge/version.rb

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

data/lib/ast/merge.rb

@@ -15,7 +15,44 @@ module Ast
     MERGE_ENGINE_ENVIRONMENT_VARIABLE = 'SMORG_MERGE_ENGINE'
     TEMPLATE_TOKEN_CONFIG = Token::Resolver::Config.new(separators: ['|', ':']).freeze
 
-    class Error < StandardError; end
+    # Base exception contract for concise user output and complete diagnostics.
+    # Ruby's exception cause chain remains the source of truth for wrapped failures.
+    class Error < StandardError
+      attr_reader :summary, :context
+
+      def initialize(message = nil, summary: nil, context: {})
+        super(summary || message)
+        @summary = (summary || message || self.class.name).to_s
+        @context = context.to_h.freeze
+      end
+
+      # Raise this error class while preserving the original exception as Ruby's cause.
+      def self.raise_with_cause(summary, cause:, context: {})
+        raise new(summary, context: context), cause: cause
+      end
+
+      # Structured exception and cause data for logs or verbose output.
+      def diagnostic_chain
+        exception = self
+        chain = []
+        while exception
+          chain << {
+            class: exception.class.name,
+            message: exception.message,
+            backtrace: exception.backtrace || []
+          }.freeze
+          exception = exception.cause
+        end
+        chain.freeze
+      end
+
+      def render_diagnostic
+        diagnostic_chain.map do |entry|
+          lines = entry[:backtrace]
+          ["#{entry[:class]}: #{entry[:message]}", *lines.map { |line| "  from #{line}" }].join("\n")
+        end.join("\nCaused by: ")
+      end
+    end
 
     class ParseError < Error
       attr_reader :errors, :content

data/sig/ast/merge.rbs

@@ -16,6 +16,13 @@ module Ast
     end
 
     class Error < StandardError
+      attr_reader summary: String
+      attr_reader context: Hash[Symbol, untyped]
+
+      def initialize: (?String message, ?summary: String?, ?context: Hash[Symbol, untyped]) -> void
+      def self.raise_with_cause: (String summary, cause: Exception, ?context: Hash[Symbol, untyped]) -> bot
+      def diagnostic_chain: () -> Array[Hash[Symbol, untyped]]
+      def render_diagnostic: () -> String
     end
 
     module PortableBenchmarkContract

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ast-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.12
+  version: 7.1.14
 platform: ruby
 authors:
 - Peter H. Boling
@@ -77,14 +77,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.12
+        version: 7.1.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.12
+        version: 7.1.14
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.18
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.23
+        version: 2.0.27
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -232,27 +232,27 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.23
+        version: 2.0.27
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -500,10 +500,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.12
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.12/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.14
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.14/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/ast-merge/7.1.12
+  documentation_uri: https://www.rubydoc.info/gems/ast-merge/7.1.14
   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