bash-merge 7.1.3 → 7.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63912e4ed1e5c589b747fe8c4bff43704efb8011c051c738c140a3a9b8372610
-  data.tar.gz: c37449f1e387c5beeb1f4bcd062a5c748ec2cbeae76c1b3dd8e1559c8f3f8404
+  metadata.gz: 3e3f73ff82048635caccf19c960791ce05565f83e3c393b6dc175d4d2d16b417
+  data.tar.gz: 96404acb74336004facfe0222183882909c23bc1de2c5ec827769c769de4b6f8
 SHA512:
-  metadata.gz: 05c63cd77818e9091f81afdc9f33212c0c66f40b266f4d9a57f7426ca4ef9c39b4a07da65d599f06f8bd8987ac12695cfbf05158d26dec7bf500243ade3a9e5b
-  data.tar.gz: ca5966709c53a0ebac627228ebf76b3bdc1541efef4cc6f40399cef04c71870b0f5fd3c0d8a325fc46a428388851d78c52e1cd919c7c82b6f49d0f25d42b0221
+  metadata.gz: 1abeafbfc3c7485a49ca9f4f45853f888f95040dd895b7df7fea1f6584fb08565711abeb41dbd4e4abae9d0b13b6166fb2f973fd6ca531838d6e9865bc1b63d9
+  data.tar.gz: 2eab528d0568ae00321490ad534bf41ac3bcbd2aab46355be98b034f6238a869648a03f9c89f5d81990706acec19c12fe3f15cacd29a57bb6292058f60144e18

data/README.md

@@ -403,7 +403,7 @@ If none of the available licenses suit your use case, please [contact us](mailto
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.810-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-1.305-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/structuredmerge/structuredmerge-ruby/blob/main/SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/bash/merge/provider.rb

@@ -5,6 +5,7 @@ require 'json'
 require 'ast/merge/source_render'
 require_relative 'node_wrapper'
 require_relative 'file_analysis'
+require_relative 'test_harness_identity'
 
 module Bash
   # Registration and source-preserving workflow implementation for Bash.
@@ -22,8 +23,9 @@ module Bash
     end
 
     # Base-aware, source-preserving provider for native top-level Bash owners.
-    # Functions and assignments have stable AST identities. Every other
-    # top-level form must remain identical across all revisions in a composite.
+    # Functions, assignments, and literal-title test_expect_success calls have
+    # stable AST identities. Every other top-level form must remain identical
+    # across all revisions in a composite.
     # rubocop:disable Metrics/AbcSize, Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/ParameterLists, Metrics/PerceivedComplexity -- provider decisions, source plans, and verification form one boundary
     class Provider
       DEFAULT_PROFILE = :source_preserving
@@ -42,7 +44,7 @@ module Bash
           backends: [TREE_SITTER_BACKEND.id.to_sym],
           profiles: [DEFAULT_PROFILE],
           role: :workflow,
-          ast_ownership: :stable_functions_and_assignments,
+          ast_ownership: :stable_functions_assignments_and_literal_test_titles,
           source_preservation: %i[exact_source declaration_fragments line_provenance reparse semantic_verification]
         }.freeze
       end
@@ -103,6 +105,9 @@ module Bash
         ownership_failure = unstable_ownership_failure(request, documents)
         return ownership_failure if ownership_failure
 
+        ownership_failure = test_harness_ownership_failure(request, documents)
+        return ownership_failure if ownership_failure
+
         decision = decide(documents, include_unmanaged_conflict: true)
         return render_conflicts(request, documents, decision) unless decision.conflicts.empty?
 
@@ -212,6 +217,8 @@ module Bash
         elsif wrapper.variable_assignment?
           name = wrapper.variable_name
           name && [:variable_assignment, name]
+        elsif (identity = TestHarnessIdentity.for(wrapper))
+          [:test_harness_call, *identity]
         else
           wrapper.signature
         end
@@ -396,7 +403,57 @@ module Bash
       end
 
       def stable_signature?(signature)
-        %i[function variable_assignment].include?(signature.first)
+        %i[function variable_assignment test_harness_call].include?(signature.first)
+      end
+
+      def test_harness_ownership_failure(request, documents)
+        sequences = documents.transform_values do |document|
+          document.owners.filter_map do |owner|
+            owner.id if owner.signature.first == :test_harness_call
+          end
+        end
+        base = sequences.fetch(:base)
+        invalid_role = %i[ours theirs].find do |role|
+          sequence = sequences.fetch(role)
+          sequence.length < base.length || sequence.first(base.length) != base
+        end
+        changed_role = %i[ours theirs].find { |role| sequences.fetch(role) != base }
+        return unless invalid_role || changed_role
+
+        reason = if invalid_role
+                   :non_append_only_test_harness_change
+                 else
+                   :test_harness_addition_requires_ordered_rendering
+                 end
+        source_role = invalid_role || changed_role
+
+        signature_digest = Digest::SHA256.hexdigest(JSON.generate(Ast::Merge.json_ready(sequences)))
+        conflict = {
+          conflict_id: "bash-test-ownership-#{signature_digest[0, 16]}",
+          category: :unproven_ast_ownership,
+          path: '<test_expect_success-sequence>',
+          owner_id: nil,
+          source_role: source_role,
+          identities: sequences,
+          reason: reason
+        }.freeze
+        decision = Decision.new(changes: [], conflicts: [conflict], choices: {})
+        rendered = render_plan(request, [whole_document_conflict(request, decision)])
+        failure(
+          :merge3,
+          request,
+          category: :unproven_ast_ownership,
+          message: 'Literal-title test_expect_success membership changes require ordered insertion rendering.',
+          conflicts: [conflict],
+          conflicted_output: rendered.content,
+          render_report: render_report(rendered, :full_file_conflict),
+          verification: { base_participated: true },
+          fallbacks: [{
+            from: :test_harness_ast_ownership,
+            to: :full_file_conflict,
+            reason: reason
+          }]
+        )
       end
 
       def side_change(base, side)

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.3'
+      VERSION = '7.1.4'
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bash-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.3
+  version: 7.1.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: 7.1.4
 - !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.0
+        version: 3.0.7
   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.0
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   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.5
+        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.5
+        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:
@@ -308,6 +308,7 @@ files:
 - 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
@@ -316,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.3
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.3/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.3
+  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