psych-merge 1.0.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3bda46dceac860e4b53fce09155c3c1e1b43df81dd15f57cc37c41dc10ab5a2
-  data.tar.gz: 197ffb4fcdd783bf6b7a9a1d191244510b2effc8628c75cf30ec3a8db5e965c8
+  metadata.gz: da88ef0bcd6745d4a3f9474f262b66507286d7688ad4a558860c3d2d53b019a4
+  data.tar.gz: ff24332a09a87a1bcf32ac34598a43d1b349cd4489908a2c55588edab4ff5020
 SHA512:
-  metadata.gz: 659097cc40dd6cc82a2cf27b5758cd526d99daf9fe61f742f7f97feb0f33193c62ec72bbc5ec37e232cb9c67c48b1f02a5f5361aa656c48bebd8f55bbc3c6d05
-  data.tar.gz: 5021e78f9e60bced7676ee4d984864836c0587edc7e6c28e34e0f69e25eb9bc141fb373c16d776a2664138a4e7e46a7c188f62ef365254d236b2dd6c947157e7
+  metadata.gz: abe7ac7e4da78dd7653871a0b785b3df24e65a9a524b9e0a849d8130bf6d52b4ab75f8d7f0302b423945d0f02e06e6adadb6781e70e8c4f1028e401e106161fe
+  data.tar.gz: dce8552b554642c454f175c06cd296c0b51f3b9b32b6ff4a159ebc55783191015f87967ef0e5b8ca527738523f8b8bae1117db4f48e36727f71a83642123d5ae

checksums.yaml.gz.sig

@@ -1 +1 @@
-x��w<^�j)�� �n`g0U�v��.�\�R��-���/���E����:b��m�|�,��(�@G-P���.�{m�/M6�ǐ׬�6�e@�F\�hZ�7����wo�+ӗ�˦�ٲ^i�6	�VR���]���508��L�g/2,���'�_����	��/-Ό� �4�M�����y�nB�TՂ��i�a� C��i��^�m"�n�"V6�"n8�*i�I̳�݌D,t�!\d��g�����R]����`ͧ6�y��!�礸`��&+�ml�"�*���?>���Y#J��)f�A����;��Æ�l��Q�ZZB��O��nc���j��A�y�I�CY8���va4G[m��;��M)D	��*��8.Н�C�	sR��
+�s�9�:�{�X7/��pM����(��L?&F����U�A�H?��^e\w��ʲ����K8��)�Nڻ�����\v��%���^ٓU��J���S8�g��~�o,ٿM���Ĺ=>>dO�F�����H�d]����h�O3��'�$û�孭��s�ܸ5���a�B.�,h����E�ݱ��
�0ח��:݆�3jI��⭵�XS�/��_Ӗ�̟az<��4w�P&&�����^�ߊ�]�0��(�<*������w`�f��G����V���߁V!?yc	d��S�w�^�e%	N�$�Kf]��U��?)~gKF	��{2�f��|\��YRrx�ߩI�Us�yS��{��qv*ͶZcr��3�

data/lib/psych/merge/version.rb

@@ -2,11 +2,10 @@
 
 module Psych
   module Merge
-    # Version information for Psych::Merge
     module Version
-      # Current version of the psych-merge gem
-      VERSION = "1.0.0"
+      VERSION = "7.0.0"
     end
-    VERSION = Version::VERSION # traditional location
+
+    VERSION = Version::VERSION
   end
 end

data/lib/psych/merge.rb

@@ -1,119 +1,91 @@
 # frozen_string_literal: true
 
-# External gems
-require "psych"
-require "version_gem"
-require "set"
-
-# Shared merge infrastructure
-require "ast/merge"
-
-# This gem
-require_relative "merge/version"
-
-# Psych::Merge provides a generic YAML file smart merge system using Psych AST analysis.
-# It intelligently merges template and destination YAML files by identifying matching
-# keys and resolving differences using structural signatures.
-#
-# @example Basic usage
-#   template = File.read("template.yml")
-#   destination = File.read("destination.yml")
-#   merger = Psych::Merge::SmartMerger.new(template, destination)
-#   result = merger.merge
-#
-# @example With debug information
-#   merger = Psych::Merge::SmartMerger.new(template, destination)
-#   debug_result = merger.merge_with_debug
-#   puts debug_result[:content]
-#   puts debug_result[:statistics]
+require "yaml"
+require "tree_haver"
+require "yaml/merge"
+
 module Psych
-  # Smart merge system for YAML files using Psych AST analysis.
-  # Provides intelligent merging by understanding YAML structure
-  # rather than treating files as plain text.
-  #
-  # @see SmartMerger Main entry point for merge operations
-  # @see FileAnalysis Analyzes YAML structure
-  # @see ConflictResolver Resolves content conflicts
   module Merge
-    # Base error class for Psych::Merge
-    # Inherits from Ast::Merge::Error for consistency across merge gems.
-    class Error < Ast::Merge::Error; end
-
-    # Raised when a YAML file has parsing errors.
-    # Inherits from Ast::Merge::ParseError for consistency across merge gems.
-    #
-    # @example Handling parse errors
-    #   begin
-    #     analysis = FileAnalysis.new(yaml_content)
-    #   rescue ParseError => e
-    #     puts "YAML syntax error: #{e.message}"
-    #     e.errors.each { |error| puts "  #{error}" }
-    #   end
-    class ParseError < Ast::Merge::ParseError
-      # @param message [String, nil] Error message (auto-generated if nil)
-      # @param content [String, nil] The YAML source that failed to parse
-      # @param errors [Array] Parse errors from Psych
-      def initialize(message = nil, content: nil, errors: [])
-        super(message, errors: errors, content: content)
+    PACKAGE_NAME = "psych-merge"
+    BACKEND_REFERENCE = TreeHaver::BackendReference.new(id: "psych", family: "native").freeze
+    TreeHaver::BackendRegistry.register(BACKEND_REFERENCE)
+
+    module_function
+
+    def yaml_feature_profile
+      Yaml::Merge.yaml_feature_profile
+    end
+
+    def available_yaml_backends
+      [BACKEND_REFERENCE]
+    end
+
+    def yaml_backend_feature_profile(backend: nil)
+      requested = backend.to_s.empty? ? BACKEND_REFERENCE.id : backend.to_s
+      return unsupported_feature_result("Unsupported YAML backend #{requested}.") unless requested == BACKEND_REFERENCE.id
+
+      yaml_feature_profile.merge(
+        backend: BACKEND_REFERENCE.id,
+        backend_ref: BACKEND_REFERENCE.to_h
+      )
+    end
+
+    def yaml_plan_context(backend: nil)
+      profile = yaml_backend_feature_profile(backend: backend)
+      return profile if profile[:ok] == false
+
+      {
+        family_profile: yaml_feature_profile,
+        feature_profile: {
+          backend: profile[:backend],
+          supports_dialects: true,
+          supported_policies: profile[:supported_policies]
+        }
+      }
+    end
+
+    def parse_yaml(source, dialect, backend: nil)
+      requested = backend.to_s.empty? ? BACKEND_REFERENCE.id : backend.to_s
+      return unsupported_feature_parse_result("Unsupported YAML backend #{requested}.") unless requested == BACKEND_REFERENCE.id
+      return unsupported_feature_parse_result("Unsupported YAML dialect #{dialect}.") unless dialect == "yaml"
+
+      parsed = YAML.safe_load(source, permitted_classes: [], aliases: false)
+      Yaml::Merge.analyze_yaml_document(parsed, dialect)
+    rescue StandardError => e
+      parse_error_result(e.message)
+    end
+
+    def match_yaml_owners(template, destination)
+      Yaml::Merge.match_yaml_owners(template, destination)
+    end
+
+    def merge_yaml(template_source, destination_source, dialect, backend: nil)
+      requested = backend.to_s.empty? ? BACKEND_REFERENCE.id : backend.to_s
+      return unsupported_feature_merge_result("Unsupported YAML backend #{requested}.") unless requested == BACKEND_REFERENCE.id
+
+      Yaml::Merge.merge_yaml_with_parser(template_source, destination_source, dialect) do |source, parse_dialect|
+        parse_yaml(source, parse_dialect, backend: requested)
       end
     end
 
-    # Raised when the template file has syntax errors.
-    #
-    # @example Handling template parse errors
-    #   begin
-    #     merger = SmartMerger.new(template, destination)
-    #     result = merger.merge
-    #   rescue TemplateParseError => e
-    #     puts "Template syntax error: #{e.message}"
-    #     e.errors.each do |error|
-    #       puts "  #{error.message}"
-    #     end
-    #   end
-    class TemplateParseError < ParseError; end
-
-    # Raised when the destination file has syntax errors.
-    #
-    # @example Handling destination parse errors
-    #   begin
-    #     merger = SmartMerger.new(template, destination)
-    #     result = merger.merge
-    #   rescue DestinationParseError => e
-    #     puts "Destination syntax error: #{e.message}"
-    #     e.errors.each do |error|
-    #       puts "  #{error.message}"
-    #     end
-    #   end
-    class DestinationParseError < ParseError; end
-
-    autoload :CommentTracker, "psych/merge/comment_tracker"
-    autoload :DebugLogger, "psych/merge/debug_logger"
-    autoload :DiffMapper, "psych/merge/diff_mapper"
-    autoload :Emitter, "psych/merge/emitter"
-    autoload :FreezeNode, "psych/merge/freeze_node"
-    autoload :FileAnalysis, "psych/merge/file_analysis"
-    autoload :MappingEntry, "psych/merge/file_analysis"
-    autoload :MergeResult, "psych/merge/merge_result"
-    autoload :NodeWrapper, "psych/merge/node_wrapper"
-    autoload :ConflictResolver, "psych/merge/conflict_resolver"
-    autoload :PartialTemplateMerger, "psych/merge/partial_template_merger"
-    autoload :SmartMerger, "psych/merge/smart_merger"
-    autoload :MappingMatchRefiner, "psych/merge/mapping_match_refiner"
-  end
-end
+    def parse_error_result(message)
+      { ok: false, diagnostics: [{ severity: "error", category: "parse_error", message: message }], policies: [] }
+    end
+    private_class_method :parse_error_result
 
-# 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)
-  Ast::Merge::RSpec::MergeGemRegistry.register(
-    :psych_merge,
-    require_path: "psych/merge",
-    merger_class: "Psych::Merge::SmartMerger",
-    test_source: "key: value",
-    category: :config,
-  )
-end
+    def unsupported_feature_parse_result(message)
+      { ok: false, diagnostics: [{ severity: "error", category: "unsupported_feature", message: message }], policies: [] }
+    end
+    private_class_method :unsupported_feature_parse_result
 
-Psych::Merge::Version.class_eval do
-  extend VersionGem::Basic
+    def unsupported_feature_merge_result(message)
+      { ok: false, diagnostics: [{ severity: "error", category: "unsupported_feature", message: message }], policies: [] }
+    end
+    private_class_method :unsupported_feature_merge_result
+
+    def unsupported_feature_result(message)
+      { ok: false, diagnostic: { severity: "error", category: "unsupported_feature", message: message } }
+    end
+    private_class_method :unsupported_feature_result
+  end
 end

data/lib/psych-merge.rb

@@ -1,6 +1,3 @@
 # frozen_string_literal: true
 
-# For technical reasons, if we move to Zeitwerk, this cannot be require_relative.
-#   See: https://github.com/fxn/zeitwerk#for_gem_extension
-# Hook for other libraries to load this library (e.g. via bundler)
-require "psych/merge"
+require_relative "psych/merge"

data.tar.gz.sig

@@ -1 +1 @@
-<��(k�j~	T��e��X],f�4�erSI-M�\83A�&�-��re5Ò��G6h�����[���aj���4���F�y�ϡ.�����t#|ߜ�V�ύ��0vю�7��)�ƑO%�'�������ߑ�e�`F���y����]L(0!���b�U9o�7Ly,&貚��3T�~�i\���IČ������)�Q+Z󕷑�N�s�Y7������:�f7���NF��@1<�D�{8�w��dz�zJ۸�t�jqjN����2�Eӑ��lUt�ŭA��Uw�*Z΂]�hڰ�Q�8ڜ"I+���|�l���/n��}���+',����*��j缇�Huzj\+"���D��q!ѩ5���BSQGb�#��
��
+XnK�Dw�4iҺF%��]�ɻ�QLJ�V �2���d♌ƹ�{��a��J-�c�����;��c��M���_��һ�X:b�.�6��C9/�c��=W��n
��$�d�r��e�BD�&z�8q;�s��k����C�y��G������ �NJx�8t�	�Z�_����J�MDD�e��6�x���	!=b��w~��#]5���r������B̪n�ؕ�s{���Z�0�sY���44�XW#��

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: psych-merge
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Peter H. Boling
-bindir: exe
+bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
@@ -38,318 +38,58 @@ cert_chain:
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: psych
+  name: yaml-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: tree_haver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.5
-- !ruby/object:Gem::Dependency
-  name: ast-merge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.5
-- !ruby/object:Gem::Dependency
-  name: version_gem
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.9
-- !ruby/object:Gem::Dependency
-  name: kettle-dev
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: bundler-audit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: require_bench
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-- !ruby/object:Gem::Dependency
-  name: appraisal2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.3
-- !ruby/object:Gem::Dependency
-  name: kettle-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.10
-- !ruby/object:Gem::Dependency
-  name: ruby-progressbar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: stone_checksums
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: gitmoji-regex
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-description: "☯️ Psych::Merge provides smart YAML file merging that preserves comments,
-  anchors/aliases, and supports freeze blocks for protecting destination content.
-  Perfect for merging configuration templates with customized destination files."
+        version: 7.0.0
+description: Psych-backed YAML provider gem for the Structured Merge YAML family.
 email:
-- floss@galtzo.com
+- info@structuredmerge.org
 executables: []
 extensions: []
-extra_rdoc_files:
-- CHANGELOG.md
-- CITATION.cff
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- FUNDING.md
-- LICENSE.txt
-- README.md
-- REEK
-- RUBOCOP.md
-- SECURITY.md
+extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- CITATION.cff
-- CODE_OF_CONDUCT.md
-- CONTRIBUTING.md
-- FUNDING.md
-- LICENSE.txt
-- README.md
-- REEK
-- RUBOCOP.md
-- SECURITY.md
 - lib/psych-merge.rb
 - lib/psych/merge.rb
-- lib/psych/merge/comment_tracker.rb
-- lib/psych/merge/conflict_resolver.rb
-- lib/psych/merge/debug_logger.rb
-- lib/psych/merge/diff_mapper.rb
-- lib/psych/merge/emitter.rb
-- lib/psych/merge/file_analysis.rb
-- lib/psych/merge/freeze_node.rb
-- lib/psych/merge/mapping_match_refiner.rb
-- lib/psych/merge/merge_result.rb
-- lib/psych/merge/node_wrapper.rb
-- lib/psych/merge/partial_template_merger.rb
-- lib/psych/merge/smart_merger.rb
 - lib/psych/merge/version.rb
-- sig/psych/merge.rbs
-homepage: https://github.com/kettle-rb/psych-merge
+homepage: https://github.com/structuredmerge/structuredmerge-ruby
 licenses:
-- MIT
+- AGPL-3.0-only
+- PolyForm-Small-Business-1.0.0
 metadata:
-  homepage_uri: https://psych-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/psych-merge/tree/v1.0.0
-  changelog_uri: https://github.com/kettle-rb/psych-merge/blob/v1.0.0/CHANGELOG.md
-  bug_tracker_uri: https://github.com/kettle-rb/psych-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/psych-merge/1.0.0
+  homepage_uri: https://structuredmerge.org
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.0.0
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.0.0/CHANGELOG.md
+  bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
+  documentation_uri: https://www.rubydoc.info/gems/psych-merge/7.0.0
   funding_uri: https://github.com/sponsors/pboling
-  wiki_uri: https://github.com/kettle-rb/psych-merge/wiki
-  news_uri: https://www.railsbling.com/tags/psych-merge
+  wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   discord_uri: https://discord.gg/3qme4XHNKN
   rubygems_mfa_required: 'true'
-rdoc_options:
-- "--title"
-- psych-merge - ☯️ Intelligent YAML file merging using Psych AST analysis
-- "--main"
-- README.md
-- "--exclude"
-- "^sig/"
-- "--line-numbers"
-- "--inline-source"
-- "--quiet"
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 4.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.5
+rubygems_version: 4.0.10
 specification_version: 4
-summary: "☯️ Intelligent YAML file merging using Psych AST analysis"
+summary: Structured Merge Psych-backed YAML analysis for Ruby
 test_files: []