smorg-rb 7.1.1 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c450da4a626c5f983cd9b487e0e42714ad674003f3b779e99716ce9237268df9
-  data.tar.gz: e21ef620c696b6cd36b4fd8bd0c7619cb788992f1a3685ca3e01e8c578633412
+  metadata.gz: e7aa889fb625e2e139a19101b23291fd91f8bfec64fdfb11f8c4635265a400aa
+  data.tar.gz: c5fbedc4b98a1e50822e67516e61e6172a8f28111e3b516d0388e3e417e85163
 SHA512:
-  metadata.gz: befc7f7bd499c36ebfeaa1b04aea6fe1672db736a2a40081b759ccdedc364427c22088112e5d0849b395da1f21cf406e6c73f0aaa2d4a4730fcecdc1ed7169dc
-  data.tar.gz: 8f3c51cd057fef2dadb1553c29b7eff34587afcd105bcdde4c78332baff7ac6b9c90f8ecb5b2313b48a7fd5943696130e4560eae497dc66dd15beba0766c5b14
+  metadata.gz: cf8b2baf7de0ce383932a0278d6e7f1cf44d7ca08cc15715c713f06792ab1ff90e12b0d7d30b4265d00b02ba3a1d90930a64d6a0dfa7b5e353612dd4824bf47c
+  data.tar.gz: 9de42f40bab39d40d17d6ee3c1d6a2e899621cb2503ce478e87e859a5ac25c233d146fd17af0029c6c18292f2481fe69d305eae8ad775d7fbd053227ba9ed08c

data/README.md

@@ -45,7 +45,7 @@ I've summarized my thoughts in [this blog post](https://dev.to/galtzo/hostile-ta
 
 ### Compatibility
 
-Compatible with MRI Ruby 4.0.0+, and concordant releases of JRuby, and TruffleRuby.
+Compatible with MRI Ruby 4.0.0+, JRuby, and TruffleRuby.
 CI workflows and Appraisals are generated for MRI Ruby 4.0.0+.
 This test floor is configured by `ruby.test_minimum` in `.kettle-jem.yml` and
 may be higher than the gem's runtime compatibility floor when legacy Rubies are
@@ -108,20 +108,12 @@ See [SECURITY.md][🔐security].
 ## 🤝 Contributing
 
 If you need some ideas of where to help, you could work on adding more code coverage,
-or if it is already 💯 (see [below](#code-coverage)) check [issues][🤝gh-issues] or [PRs][🤝gh-pulls],
-or use the gem and think about how it could be better.
+check [issues][🤝gh-issues] or [PRs][🤝gh-pulls], or use the gem and think about how it could be better.
 
 We [![Keep A Changelog][📗keep-changelog-img]][📗keep-changelog] so if you make changes, remember to update it.
 
 See [CONTRIBUTING.md][🤝contributing] for more detailed instructions.
 
-### Code Coverage
-
-<details markdown="1">
-<summary>Coverage service badges</summary>
-
-</details>
-
 ## 📌 Versioning
 
 This library follows [![Semantic Versioning 2.0.0][📌semver-img]][📌semver] for its public API where practical.

data/lib/smorg/rb/version.rb

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

data/lib/smorg/rb.rb

@@ -1,17 +1,25 @@
 # frozen_string_literal: true
 
 require 'English'
+require 'bash/merge'
 require 'go-merge'
+require 'html/merge'
 require 'ast/merge'
 require 'ast-merge-git'
 require 'diff/lcs'
 require 'diff/lcs/hunk'
+require 'dotenv/merge'
 require 'json'
 require 'json-merge'
 require 'kettle/jem'
 require 'kettle/jem/tasks/install_task'
-require 'markly/merge'
+require 'markdown/merge'
 require 'plain-merge'
+require 'rbs/merge'
+require 'ruby/merge'
+require 'toml/merge'
+require 'typescript/merge'
+require 'yaml/merge'
 require_relative 'rb/version'
 
 module Smorg
@@ -438,7 +446,8 @@ module Smorg
         path_name: path_name,
         ok: ok,
         exit_code: exit_code,
-        fallbacks: fallbacks,
+        fallbacks: result.fetch(:fallbacks, []) + fallbacks,
+        conflicts: result.fetch(:conflicts, []),
         change_classifications: result.fetch(:change_classifications, []),
         owned_regions: result.fetch(:owned_regions, []),
         render_report: result[:render_report],
@@ -447,6 +456,8 @@ module Smorg
         secondary_formatting_metrics: result[:secondary_formatting_metrics],
         default_driver_evaluation: result[:default_driver_evaluation],
         profile: result[:profile],
+        provider: result[:provider],
+        verification: result[:verification],
         diagnostics: result.fetch(:diagnostics, [])
       }
       File.write(report_path, "#{JSON.pretty_generate(Ast::Merge.json_ready(report))}\n")
@@ -632,12 +643,27 @@ module Smorg
       end
 
       [
+        '*.bash merge=smorg-rb diff=smorg-rb smorg.language=bash',
         '*.go merge=smorg-rb diff=smorg-rb smorg.language=go',
+        '*.htm merge=smorg-rb diff=smorg-rb smorg.language=html',
+        '*.html merge=smorg-rb diff=smorg-rb smorg.language=html',
+        '*.env merge=smorg-rb diff=smorg-rb smorg.language=dotenv',
+        '.env merge=smorg-rb diff=smorg-rb smorg.language=dotenv',
+        '.env.* merge=smorg-rb diff=smorg-rb smorg.language=dotenv',
         '*.json merge=smorg-rb diff=smorg-rb smorg.language=json',
         '*.jsonc merge=smorg-rb diff=smorg-rb smorg.language=jsonc',
         '*.json5 merge=smorg-rb diff=smorg-rb smorg.language=json5',
         '*.md merge=smorg-rb diff=smorg-rb smorg.language=markdown',
-        '*.markdown merge=smorg-rb diff=smorg-rb smorg.language=markdown'
+        '*.markdown merge=smorg-rb diff=smorg-rb smorg.language=markdown',
+        '*.rb merge=smorg-rb diff=smorg-rb smorg.language=ruby',
+        '*.rbs merge=smorg-rb diff=smorg-rb smorg.language=rbs',
+        '*.rs merge=smorg-rb diff=smorg-rb smorg.language=rust',
+        '*.sh merge=smorg-rb diff=smorg-rb smorg.language=bash',
+        '*.toml merge=smorg-rb diff=smorg-rb smorg.language=toml',
+        '*.ts merge=smorg-rb diff=smorg-rb smorg.language=typescript',
+        '*.tsx merge=smorg-rb diff=smorg-rb smorg.language=tsx',
+        '*.yml merge=smorg-rb diff=smorg-rb smorg.language=yaml',
+        '*.yaml merge=smorg-rb diff=smorg-rb smorg.language=yaml'
       ].each { |line| stdout.puts(line) }
       EXIT_SUCCESS
     end
@@ -645,151 +671,215 @@ module Smorg
     def merge_by_path(path_name, language, conflict_marker_size, fallback_policy, ancestor_source, current_source,
                       other_source)
       case normalize_language(language, path_name)
+      when 'bash'
+        merge3_result(
+          Ast::Merge::Git.merge3(
+            base_source: ancestor_source,
+            ours_source: current_source,
+            theirs_source: other_source,
+            path_name: path_name,
+            provider_id: 'ruby.bash',
+            family: 'bash',
+            dialect: 'bash',
+            backend: 'kreuzberg-language-pack',
+            profile_id: 'source_preserving',
+            fallback_policy: fallback_policy,
+            conflict_marker_size: conflict_marker_size
+          )
+        )
       when 'go'
-        Go::Merge.merge_go(other_source, current_source, 'go')
-      when 'json'
         merge3_result(
           Ast::Merge::Git.merge3(
             base_source: ancestor_source,
             ours_source: current_source,
             theirs_source: other_source,
             path_name: path_name,
-            language: 'json',
-            dialect: 'json',
-            profile_id: 'json.keyed-object',
+            provider_id: 'ruby.go',
+            family: 'go',
+            dialect: 'go',
+            backend: 'kreuzberg-language-pack',
+            profile_id: 'source_preserving',
             fallback_policy: fallback_policy,
-            conflict_marker_size: conflict_marker_size,
-            render_policy: 'canonical'
+            conflict_marker_size: conflict_marker_size
+          )
+        )
+      when 'html'
+        merge3_result(
+          Ast::Merge::Git.merge3(
+            base_source: ancestor_source,
+            ours_source: current_source,
+            theirs_source: other_source,
+            path_name: path_name,
+            provider_id: 'ruby.html',
+            family: 'html',
+            dialect: 'html',
+            backend: 'kreuzberg-language-pack',
+            profile_id: 'source_preserving',
+            fallback_policy: fallback_policy,
+            conflict_marker_size: conflict_marker_size
+          )
+        )
+      when 'dotenv'
+        merge3_result(
+          Ast::Merge::Git.merge3(
+            base_source: ancestor_source,
+            ours_source: current_source,
+            theirs_source: other_source,
+            path_name: path_name,
+            family: 'dotenv',
+            dialect: 'dotenv',
+            backend: 'dotenv-line',
+            profile_id: 'source_preserving',
+            fallback_policy: fallback_policy,
+            conflict_marker_size: conflict_marker_size
+          )
+        )
+      when 'json', 'jsonc', 'json5'
+        merge3_result(
+          Ast::Merge::Git.merge3(
+            base_source: ancestor_source,
+            ours_source: current_source,
+            theirs_source: other_source,
+            path_name: path_name,
+            family: 'json',
+            dialect: normalize_language(language, path_name),
+            profile_id: 'source_preserving',
+            fallback_policy: fallback_policy,
+            conflict_marker_size: conflict_marker_size
           )
         )
-      when 'jsonc'
-        Json::Merge.merge_json(other_source, current_source, 'jsonc')
-      when 'json5'
-        Json::Merge.merge_json(other_source, current_source, 'json5')
       when 'markdown'
-        merge_markdown(ancestor_source, current_source, other_source)
+        merge3_result(
+          Ast::Merge::Git.merge3(
+            base_source: ancestor_source,
+            ours_source: current_source,
+            theirs_source: other_source,
+            path_name: path_name,
+            provider_id: 'ruby.markdown',
+            family: 'markdown',
+            dialect: 'markdown',
+            backend: 'kreuzberg-language-pack',
+            profile_id: 'source_preserving',
+            fallback_policy: fallback_policy,
+            conflict_marker_size: conflict_marker_size
+          )
+        )
+      when 'ruby'
+        merge3_result(
+          Ast::Merge::Git.merge3(
+            base_source: ancestor_source,
+            ours_source: current_source,
+            theirs_source: other_source,
+            path_name: path_name,
+            provider_id: 'ruby.ruby',
+            family: 'ruby',
+            dialect: 'ruby',
+            backend: 'prism',
+            profile_id: 'source_preserving',
+            fallback_policy: fallback_policy,
+            conflict_marker_size: conflict_marker_size
+          )
+        )
+      when 'rbs'
+        merge3_result(
+          Ast::Merge::Git.merge3(
+            base_source: ancestor_source,
+            ours_source: current_source,
+            theirs_source: other_source,
+            path_name: path_name,
+            provider_id: 'ruby.rbs',
+            family: 'rbs',
+            dialect: 'rbs',
+            backend: 'rbs',
+            profile_id: 'source_preserving',
+            fallback_policy: fallback_policy,
+            conflict_marker_size: conflict_marker_size
+          )
+        )
+      when 'rust'
+        merge3_result(
+          Ast::Merge::Git.merge3(
+            base_source: ancestor_source,
+            ours_source: current_source,
+            theirs_source: other_source,
+            path_name: path_name,
+            provider_id: 'ruby.rust',
+            family: 'rust',
+            dialect: 'rust',
+            backend: 'kreuzberg-language-pack',
+            profile_id: 'source_preserving',
+            fallback_policy: fallback_policy,
+            conflict_marker_size: conflict_marker_size
+          )
+        )
+      when 'toml'
+        merge3_result(
+          Ast::Merge::Git.merge3(
+            base_source: ancestor_source,
+            ours_source: current_source,
+            theirs_source: other_source,
+            path_name: path_name,
+            provider_id: 'ruby.toml',
+            family: 'toml',
+            dialect: 'toml',
+            backend: 'kreuzberg-language-pack',
+            profile_id: 'source_preserving',
+            fallback_policy: fallback_policy,
+            conflict_marker_size: conflict_marker_size
+          )
+        )
+      when 'typescript', 'tsx'
+        dialect = normalize_language(language, path_name)
+        merge3_result(
+          Ast::Merge::Git.merge3(
+            base_source: ancestor_source,
+            ours_source: current_source,
+            theirs_source: other_source,
+            path_name: path_name,
+            provider_id: 'ruby.typescript',
+            family: 'typescript',
+            dialect: dialect,
+            backend: 'kreuzberg-language-pack',
+            profile_id: 'source_preserving',
+            fallback_policy: fallback_policy,
+            conflict_marker_size: conflict_marker_size
+          )
+        )
+      when 'yaml'
+        merge3_result(
+          Ast::Merge::Git.merge3(
+            base_source: ancestor_source,
+            ours_source: current_source,
+            theirs_source: other_source,
+            path_name: path_name,
+            provider_id: 'ruby.yaml',
+            family: 'yaml',
+            dialect: 'yaml',
+            backend: 'kreuzberg-language-pack',
+            profile_id: 'source_preserving',
+            fallback_policy: fallback_policy,
+            conflict_marker_size: conflict_marker_size
+          )
+        )
       when 'text'
-        Plain::Merge.merge_text(other_source, current_source)
+        merge3_result(
+          Ast::Merge::Git.merge3(
+            base_source: ancestor_source,
+            ours_source: current_source,
+            theirs_source: other_source,
+            path_name: path_name,
+            family: 'text',
+            dialect: 'text',
+            profile_id: 'coarse_document',
+            fallback_policy: fallback_policy,
+            conflict_marker_size: conflict_marker_size
+          )
+        )
       else
         unsupported_language_result(normalize_language(language, path_name), path_name)
       end
     end
 
-    def merge_markdown(ancestor_source, current_source, other_source)
-      return { ok: true, diagnostics: [], output: current_source, policies: [] } if other_source == ancestor_source
-      return { ok: true, diagnostics: [], output: other_source, policies: [] } if current_source == ancestor_source
-      if markdown_theirs_changes_already_present?(ancestor_source, current_source, other_source)
-        return { ok: true, diagnostics: [], output: current_source, policies: [] }
-      end
-
-      result = Markly::Merge::SmartMerger.new(
-        other_source,
-        current_source,
-        add_template_only_nodes: true,
-        inner_merge_code_blocks: true,
-        inner_merge_lists: true,
-        normalize_whitespace: :basic
-      ).merge_result
-      {
-        ok: result.success?,
-        diagnostics: result.conflicts.map do |conflict|
-          {
-            severity: 'error',
-            category: 'merge_conflict',
-            message: conflict[:message] || conflict[:reason] || 'unresolved Markdown conflict'
-          }
-        end,
-        output: result.content,
-        policies: []
-      }
-    rescue Markdown::Merge::ParseError => e
-      {
-        ok: false,
-        diagnostics: [{ severity: 'error', category: 'parse_error', message: e.message }],
-        policies: []
-      }
-    rescue StandardError => e
-      {
-        ok: false,
-        diagnostics: [{ severity: 'error', category: 'merge_error', message: e.message }],
-        policies: []
-      }
-    end
-
-    def markdown_theirs_changes_already_present?(ancestor_source, current_source, other_source)
-      ancestor_sections = markdown_sections(ancestor_source)
-      current_sections = markdown_sections(current_source)
-      other_sections = markdown_sections(other_source)
-      return false unless ancestor_sections && current_sections && other_sections
-
-      ancestor_by_path = sections_by_path(ancestor_sections)
-      ancestor_by_heading = sections_by_heading(ancestor_sections)
-      current_by_path = sections_by_path(current_sections)
-      current_by_heading = sections_by_heading(current_sections)
-
-      changed_sections = other_sections.filter do |section|
-        ancestor_text = ancestor_by_path[section[:path]] || ancestor_by_heading[markdown_heading_key(section[:text])]
-        ancestor_text != section[:text]
-      end
-      return false if changed_sections.empty?
-
-      changed_sections.all? do |section|
-        other_text = section[:text]
-        heading_key = markdown_heading_key(other_text)
-        ancestor_text = ancestor_by_heading[heading_key] || ancestor_by_path.fetch(section[:path], '')
-        current_text = current_by_heading[heading_key] || current_by_path[section[:path]]
-        next false unless current_text
-
-        introduced_tokens = markdown_significant_tokens(other_text) - markdown_significant_tokens(ancestor_text)
-        !introduced_tokens.empty? && introduced_tokens.subset?(markdown_significant_tokens(current_text))
-      end
-    end
-
-    def markdown_sections(source)
-      parsed = Markly::Merge.parse_markdown(source, 'markdown')
-      return nil unless parsed[:ok]
-
-      Markdown::Merge.collect_markdown_sections(
-        parsed.dig(:analysis, :normalized_source),
-        parsed.dig(:analysis, :owners)
-      )
-    end
-
-    def sections_by_path(sections)
-      sections.to_h { |section| [section[:path], section[:text]] }
-    end
-
-    def sections_by_heading(sections)
-      sections.each_with_object({}) do |section, map|
-        key = markdown_heading_key(section[:text])
-        map[key] ||= section[:text] unless key.empty?
-      end
-    end
-
-    def markdown_heading_key(section_text)
-      heading = section_text.each_line.find { |line| line.start_with?('#') }.to_s.strip
-      heading = heading.delete_prefix('#').strip while heading.start_with?('#')
-      heading.downcase
-    end
-
-    def markdown_significant_tokens(source)
-      source.split.each_with_object(Set.new) do |raw_token, tokens|
-        token = normalize_markdown_token(raw_token)
-        tokens << token if token.length >= 8
-      end
-    end
-
-    def normalize_markdown_token(raw_token)
-      token = raw_token.downcase
-      loop do
-        previous = token
-        token = token.delete_prefix('(').delete_prefix('[').delete_prefix('{').delete_prefix('<')
-        token = token.delete_suffix(')').delete_suffix(']').delete_suffix('}').delete_suffix('>')
-        token = token.delete_suffix('.').delete_suffix(',').delete_suffix(';').delete_suffix(':')
-        return token if token == previous
-      end
-    end
-
     def unsupported_language_result(language, path_name)
       {
         ok: false,
@@ -807,10 +897,10 @@ module Smorg
     def merge3_result(result)
       merge3_report_fields = {
         change_classifications: result.fetch(:change_classifications, []),
-        reparse_after_render: result[:reparse_after_render],
-        formatting_preservation: result[:formatting_preservation],
-        secondary_formatting_metrics: result[:secondary_formatting_metrics],
-        default_driver_evaluation: result[:default_driver_evaluation]
+        conflicts: result.fetch(:conflicts, []),
+        fallbacks: result.fetch(:fallbacks, []),
+        provider: result.fetch(:provider, {}),
+        verification: result.fetch(:verification, {})
       }
       if result[:ok] && result[:merged_source]
         {
@@ -848,9 +938,22 @@ module Smorg
     end
 
     def normalize_language(language, path_name)
+      return 'bash' if language.to_s.strip.empty? && %w[.bash .sh].include?(File.extname(path_name.to_s).downcase)
+      return 'go' if language.to_s.strip.empty? && File.extname(path_name.to_s).downcase == '.go'
+      return 'html' if language.to_s.strip.empty? && %w[.htm .html].include?(File.extname(path_name.to_s).downcase)
+      return 'rust' if language.to_s.strip.empty? && File.extname(path_name.to_s).downcase == '.rs'
+      return 'typescript' if language.to_s.strip.empty? && File.extname(path_name.to_s).downcase == '.ts'
+      return 'tsx' if language.to_s.strip.empty? && File.extname(path_name.to_s).downcase == '.tsx'
+
       case language.to_s.strip.downcase
+      when 'bash', 'sh', 'application/x-sh', 'text/x-shellscript'
+        'bash'
       when 'go', 'golang'
         'go'
+      when 'html', 'htm', 'text/html', 'html5'
+        'html'
+      when 'dotenv', 'env', 'config-env'
+        'dotenv'
       when 'json'
         'json'
       when 'jsonc', 'json with comments'
@@ -859,6 +962,20 @@ module Smorg
         'json5'
       when 'markdown', 'md', 'gfm', 'text/markdown'
         'markdown'
+      when 'ruby', 'rb', 'application/x-ruby'
+        'ruby'
+      when 'rbs'
+        'rbs'
+      when 'rust', 'rs', 'application/rust', 'text/rust'
+        'rust'
+      when 'toml', 'application/toml'
+        'toml'
+      when 'typescript', 'ts', 'application/typescript', 'text/typescript'
+        'typescript'
+      when 'tsx', 'typescriptreact'
+        'tsx'
+      when 'yaml', 'yml', 'application/yaml', 'text/yaml'
+        'yaml'
       when 'plain', 'text', 'plaintext', 'text/plain'
         'text'
       else
@@ -973,3 +1090,5 @@ module Smorg
     end
   end
 end
+
+require 'rust/merge'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smorg-rb
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.3
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: ast-merge-git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
+- !ruby/object:Gem::Dependency
+  name: bash-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -79,76 +93,180 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: dotenv-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: go-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
+- !ruby/object:Gem::Dependency
+  name: html-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: json-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: kettle-jem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.3
+- !ruby/object:Gem::Dependency
+  name: markdown-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
-  name: markly-merge
+  name: plain-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
-  name: plain-merge
+  name: rbs-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.1
+        version: 7.1.3
+- !ruby/object:Gem::Dependency
+  name: ruby-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
+- !ruby/object:Gem::Dependency
+  name: rust-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
+- !ruby/object:Gem::Dependency
+  name: toml-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
+- !ruby/object:Gem::Dependency
+  name: typescript-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -169,26 +287,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.15
+- !ruby/object:Gem::Dependency
+  name: yaml-merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: kettle-dev
   requirement: !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.0
   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.0
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -266,7 +398,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
@@ -276,7 +408,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
@@ -306,7 +438,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -316,7 +448,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.4
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -393,10 +525,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.3
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.3/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/smorg-rb/7.1.1
+  documentation_uri: https://www.rubydoc.info/gems/smorg-rb/7.1.3
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/smorg-rb