psych-merge 7.1.3 → 7.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: effeefd9ca35015e0fb306e5e2f22f48d774cb21e8cadfb7e1e49b7a28343015
-  data.tar.gz: bdc4795f96a7903ac928a5e5a376f8ecb9040aa10eac9f11569b9bc256e36356
+  metadata.gz: 241fd3480963a5313594945da604ff94f0294d19da35131b69768dcccfd4f1c7
+  data.tar.gz: 366cfd19de7c2e043def63041fc419735320f90ebeebfcb109db81692b07c2f2
 SHA512:
-  metadata.gz: 5a7606d1f679163a5f268cb5e3b6eb504496882b9c41d9e5a24bafa64b07cbdf2f78337d6f58d07384fab1c50910a5a3b2424dca20c03baaa7c951096db1e204
-  data.tar.gz: 9516a9cd5d40d6ad876b34015a3bc0a0e37d678f7c44de0aec4f1bfde3f9f949ed55b01bbbad75d34e0937d7196114eeaee5f13b547a4f20a4aa5e231d9adcbc
+  metadata.gz: 27ff6f39e528910b4a17eb24f78d01fb0ef40482fdb5d8f44917f11f4a3afa687e8c83ad2f8cabc03079152eb2cb9b400df1c6fe5d845d9756e1cc6df2447dc1
+  data.tar.gz: 78faf0e4bd85a5a24ec39feeb1f76258f6d50f28555454790083b7fd2a98c6b753c39bacfb72837b36edc1ae2b9ed4c5ff1a4e6dde1d6246b53e25935492cfc0

data/README.md

@@ -468,7 +468,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-2.008-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-2.371-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/psych/merge/version.rb

@@ -5,7 +5,7 @@ module Psych
     # 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

data/lib/psych/merge.rb

@@ -3,6 +3,7 @@
 # External gems
 require 'psych'
 require 'tree_haver'
+require 'yaml/merge'
 
 # Shared merge infrastructure
 require 'ast/merge'
@@ -157,13 +158,13 @@ module Psych
         return unsupported_feature_parse_result("Unsupported YAML dialect #{dialect}.") unless dialect == 'yaml'
 
         parsed = yaml_value_for_source(source)
-        Ast::Merge::YamlDocument.analyze(parsed, dialect)
+        Yaml::Merge.analyze_yaml_document(parsed, dialect)
       rescue TreeHaver::Error, StandardError => e
         parse_error_result(e.message)
       end
 
       def match_yaml_owners(template, destination)
-        Ast::Merge::YamlDocument.match_owners(template, destination)
+        Yaml::Merge.match_yaml_owners(template, destination)
       end
 
       def merge_yaml(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych-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
@@ -85,6 +85,20 @@ 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.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.1.4
 - !ruby/object:Gem::Dependency
   name: kettle-dev
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +108,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 +118,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 +216,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 +226,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 +236,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 +246,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 +290,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 +300,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.11
+        version: 2.0.12
 description: "☯️ Psych-backed YAML provider gem for the Structured Merge YAML family."
 email:
 - floss@galtzo.com
@@ -320,10 +334,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/psych-merge/7.1.3
+  documentation_uri: https://www.rubydoc.info/gems/psych-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/psych-merge