bash-merge 7.1.9 → 7.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fccd05f8020f601e0ea803a9451a578b46313ad3f0ce3c2315af7b6169c33e75
-  data.tar.gz: e2ef11053b28cd3b096d283af2f11e6677bae23748f14f15bc47dd6656cd9d1a
+  metadata.gz: 123dae7219ce26037d3297a38241d4558ab5a04eb6900321f32754a34f3d1d8a
+  data.tar.gz: 309f9daa0c1003f1b4c315926d78f50de7b71364460653ce3ddac60c27a35652
 SHA512:
-  metadata.gz: 6e5b840951062a0ad95cc5cb3c949225578d66ccc7cecfe35392934970af7f920e4978184def079fdbfbf996ccae3bb0748bfd35f53e3c3462486086d78e0518
-  data.tar.gz: 71b1562ed0617c4f2e1fb3c294019eb6e0421c129d6bdd18d0dd56c825929424881c07311c6d082ebf94edccdf0483f252b0fd85fe516abbd4bd439dbfb3156a
+  metadata.gz: 6b576340b074ff3bf0774da61434d97b950229e3adb0050e3581a1506d84de9a01ce39277b38d8baa561cdd5239e01dc9b8c03d59ffba5062223ad51ae04e51d
+  data.tar.gz: 5d84127744a77716c69a7f345333ed3d18594f7241b450acabb20321e762cec4343f470c60ae9dc48ba3f003337e303569cc59bded249ffb8ceb765654787c1d

data/lib/bash/merge/file_analysis.rb

@@ -230,6 +230,10 @@ module Bash
         # TreeHaver handles backend selection against the grammars Bash::Merge
         # has already registered during bootstrap.
         # Set TREE_HAVER_BACKEND=ffi for bash (MRI/Rust have compatibility issues)
+        if @parser_path && (TreeHaver.current_backend_id || ENV['TREE_HAVER_BACKEND']).to_s == 'rust_tslp'
+          raise TreeHaver::NotAvailable, 'Rust TSLP fallback does not support an explicit parser path'
+        end
+
         parser = if @parser_path
                    TreeHaver.with_language_registration(
                      :bash,

data/lib/bash/merge/rust_host_provider.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'ast/merge'
+require 'ast/merge/typed_core_provider'
+
+module Bash
+  module Merge
+    # Opt-in Rust provider for the portable top-level function/assignment and
+    # literal-title test-harness subset. Compatibility name, not a prototype dependency.
+    class RustHostProvider < Ast::Merge::TypedCoreProvider
+      PROVIDER_ID = 'rust.bash'
+      FAMILY = 'bash'
+      DIALECTS = [:bash].freeze
+      OPERATIONS = %i[analyze diff2 merge2 merge3].freeze
+      CORE_PROVIDER = 'kernel.bash'
+      CORE_PROFILE = 'kernel.bash.owners.v1'
+      PACKAGE = 'bash-merge'
+
+      def capabilities
+        super.merge(ast_ownership: :top_level_functions_assignments_and_literal_test_titles).freeze
+      end
+
+      private
+
+      def package_version = Bash::Merge::Version::VERSION
+      def parser_language(dialect) = dialect
+      def owner_path(owner) = owner.fetch('id')
+
+      def additional_fields = %i[path_name labels conflict_marker_size]
+
+      def policy(operation, request)
+        # Git supplies neutral framing even to non-rendering providers. A path
+        # is context, never a language selector. This profile emits no markers:
+        # accept only empty labels and the default width, not custom requests.
+        labels = request.fetch(:labels, {})
+        width = request[:conflict_marker_size]
+        width = Integer(width, 10) if width.is_a?(String)
+        unless labels == {} && (width.nil? || (width.is_a?(Integer) && width == 7))
+          raise ArgumentError, 'Typed Bash does not support custom conflict markers or labels'
+        end
+
+        super
+      end
+    end
+  end
+end

data/lib/bash/merge/version.rb

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

data/lib/bash/merge.rb

@@ -120,6 +120,7 @@ module Bash
     autoload :MergeResult, 'bash/merge/merge_result'
     autoload :NodeWrapper, 'bash/merge/node_wrapper'
     autoload :Provider, 'bash/merge/provider'
+    autoload :RustHostProvider, 'bash/merge/rust_host_provider'
     autoload :SmartMerger, 'bash/merge/smart_merger'
 
     class << self
@@ -144,6 +145,14 @@ module Bash
         availability(source: source).available?
       end
 
+      def rust_host_provider
+        @rust_host_provider ||= RustHostProvider.new
+      end
+
+      def register_rust_host_provider!(replace: false)
+        Ast::Merge.register_provider(rust_host_provider, replace: replace)
+      end
+
       def availability(source: "#!/usr/bin/env bash\necho hello\n")
         diagnostics = []
         grammar_path = bash_grammar_path(diagnostics)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bash-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.9
+  version: 7.1.11
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.11
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.11
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -91,20 +91,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.34
+        version: 3.1.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.34
+        version: 3.1.8
 - !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.3
+        version: 3.2.5
   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.3
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.0.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.0.23
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.14
   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.7
+        version: 3.2.14
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -256,7 +256,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -266,7 +266,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: gitmoji-regex
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +276,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -286,7 +286,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.15
 description: "☯️ Bash statement, comment, freeze-block, and template merge behavior
   for Structured Merge."
 email:
@@ -307,6 +307,7 @@ files:
 - lib/bash/merge/merge_result.rb
 - lib/bash/merge/node_wrapper.rb
 - lib/bash/merge/provider.rb
+- lib/bash/merge/rust_host_provider.rb
 - lib/bash/merge/smart_merger.rb
 - lib/bash/merge/test_harness_identity.rb
 - lib/bash/merge/version.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.9
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.9/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.11
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.11/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/bash-merge/7.1.9
+  documentation_uri: https://www.rubydoc.info/gems/bash-merge/7.1.11
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/bash-merge
@@ -350,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.20
 specification_version: 4
 summary: "☯️ Structured Merge Bash analysis and merge for Ruby"
 test_files: []