bash-merge 7.1.1 → 7.1.4

data/lib/bash/merge/test_harness_identity.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Bash
+  module Merge
+    # Extracts bounded AST identities for Git-style shell test harness calls.
+    class TestHarnessIdentity
+      class << self
+        def for(wrapper)
+          return unless wrapper.command? && wrapper.command_name == 'test_expect_success'
+
+          identity = literal_identity(wrapper)
+          [:test_expect_success, *identity] if identity
+        end
+
+        private
+
+        def literal_identity(wrapper)
+          arguments = command_argument_nodes(wrapper.node)
+          return [source_for(wrapper, arguments.first)] if simple_literal_title?(arguments)
+          return unless qualified_literal_title?(arguments)
+
+          arguments.first(2).map { |argument| source_for(wrapper, argument) }
+        end
+
+        def command_argument_nodes(node)
+          children = node.children.select(&:named?)
+          command_index = children.index { |child| %w[word command_name].include?(child.type.to_s) }
+          return [] unless command_index
+
+          arguments = children.drop(command_index + 1)
+          arguments.any? { |child| child.type.to_s.include?('redirect') } ? [] : arguments
+        end
+
+        def simple_literal_title?(arguments)
+          arguments.length == 2 && literal_title?(arguments.first)
+        end
+
+        def qualified_literal_title?(arguments)
+          arguments.length == 3 &&
+            literal_prerequisite?(arguments[0]) &&
+            literal_title?(arguments[1])
+        end
+
+        def literal_prerequisite?(argument)
+          argument.type.to_s == 'word' && argument.children.none?(&:named?)
+        end
+
+        def literal_title?(argument)
+          return true if argument.type.to_s == 'raw_string'
+          return false unless argument.type.to_s == 'string'
+
+          argument.children.select(&:named?).all? { |child| child.type.to_s == 'string_content' }
+        end
+
+        def source_for(wrapper, node)
+          start_offset = node.start_byte - wrapper.start_byte
+          end_offset = node.end_byte - wrapper.start_byte
+          wrapper.source_text.byteslice(start_offset...end_offset).to_s
+        end
+      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.1'
+      VERSION = '7.1.4'
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/bash/merge.rb

@@ -119,6 +119,7 @@ module Bash
     autoload :FileAnalysis, 'bash/merge/file_analysis'
     autoload :MergeResult, 'bash/merge/merge_result'
     autoload :NodeWrapper, 'bash/merge/node_wrapper'
+    autoload :Provider, 'bash/merge/provider'
     autoload :SmartMerger, 'bash/merge/smart_merger'
 
     class << self
@@ -208,6 +209,9 @@ TreeHaver::BackendRegistry.register_tag(:bash_grammar, category: :grammar, backe
   Bash::Merge.available?
 end
 
+require_relative 'merge/provider'
+Bash::Merge.register_provider!
+
 # Register with ast-merge's MergeGemRegistry for RSpec dependency tags
 # Only register if MergeGemRegistry is loaded (i.e., in test environment)
 if defined?(Ast::Merge::RSpec::MergeGemRegistry)

data/sig/bash/merge.rbs

@@ -1,5 +1,27 @@
 module Bash
   module Merge
+    class NodeWrapper
+      attr_reader node: untyped
+      def start_byte: () -> Integer
+      def end_byte: () -> Integer
+      def source_text: () -> String
+      def semantic_tree: () -> Array[untyped]
+      def heredoc?: () -> bool
+    end
+
+    class Provider
+      def provider_id: () -> String
+      def family: () -> String
+      def capabilities: () -> Hash[Symbol, untyped]
+      def analyze: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def diff2: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def merge2: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def merge3: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+    end
+
+    def self.merge_provider: () -> Provider
+    def self.register_provider!: (?replace: bool) -> untyped
+
     module Version
       VERSION: String
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bash-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ 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
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     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
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -91,20 +91,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 +182,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 +192,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 +202,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 +212,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 +222,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 +232,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 +276,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,7 +286,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
 description: "☯️ Bash statement, comment, freeze-block, and template merge behavior
   for Structured Merge."
 email:
@@ -306,7 +306,9 @@ files:
 - lib/bash/merge/freeze_node.rb
 - lib/bash/merge/merge_result.rb
 - lib/bash/merge/node_wrapper.rb
+- lib/bash/merge/provider.rb
 - lib/bash/merge/smart_merger.rb
+- lib/bash/merge/test_harness_identity.rb
 - lib/bash/merge/version.rb
 - sig/bash/merge.rbs
 homepage: https://github.com/structuredmerge/structuredmerge-ruby
@@ -315,10 +317,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/bash-merge/7.1.1
+  documentation_uri: https://www.rubydoc.info/gems/bash-merge/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/bash-merge