config-merge 7.1.13 → 7.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d88bcf213ac283e2ead497bcae0ff73e001e4f49d75d6787fd15792c40f0c7d
-  data.tar.gz: fa8eab1bdf98f112e74994e9252e1019d149225e7cef42080edc7624ef7d5e51
+  metadata.gz: 7da59de9d28352693307652bfe470c19c0584949f9d09af0a3785ef9aa31e76e
+  data.tar.gz: c2e078ef9986e8166cb15bd03ef7c2bff51f600b9bc3a10241b790af25dff965
 SHA512:
-  metadata.gz: d0dd2e1b2d1c81139004406c7a1fa53cbdfc72816a9e8aca1e02b456eb88e0f81cdeebdfec9dff1f9b6167422a7e38477dc87ff723c15c8a804d6fb87ebdec74
-  data.tar.gz: 214e8bdffc1931f119f311f4c8f7517d05e434f71e6d05a2317b92dcec29b76e90a7197b470c6ec3b34d9923860010ba11d021c3e4ec7de05da15a910d636541
+  metadata.gz: 53fd603defb6db40519d9e63a3e5987f0671abee7cc25508d0371e7184e979c0012685623bd9fe73eb1765dde951f64fa14eb4c2f4afcfed83bdb7fd1b9b5e57
+  data.tar.gz: c8e669fa80906ad59a37bb1604f81f72814121ba47cbfa4978818ca400884ed945fc025bffa1e95ee6be17a532c4bb6db6e555741bd7b68215b0cda5ce22e31d

data/lib/config/merge/version.rb

@@ -5,7 +5,7 @@ module Config
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = "7.1.13"
+      VERSION = "7.1.14"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/config/merge.rb

@@ -2,7 +2,6 @@
 
 require "ast/merge"
 require "version_gem"
-require_relative "merge/version"
 require_relative "merge/normalizer_registry"
 require_relative "merge/policy"
 require_relative "merge/built_in_policies"
@@ -10,6 +9,7 @@ require_relative "merge/flag_file/option"
 require_relative "merge/flag_file/parser"
 require_relative "merge/flag_file/result"
 require_relative "merge/flag_file/three_way_merger"
+require_relative "merge/version"
 
 module Config
   module Merge
@@ -18,8 +18,8 @@ module Config
   end
 end
 
+require_relative "merge/provider_adapter"
+
 Config::Merge::Version.class_eval do
   extend VersionGem::Basic
 end
-
-require_relative "merge/provider_adapter"

data/sig/config/merge.rbs

@@ -1,90 +1,8 @@
 module Config
   module Merge
-    class Error < StandardError
+    module Version
+      VERSION: String
     end
-
-    class NormalizerRegistry
-      class UnknownNormalizerError < ArgumentError
-      end
-
-      def self.register: (String | Symbol name, ?Proc callable, ?replace: bool) -> Symbol
-                       | (String | Symbol name, ?replace: bool) { (untyped) -> untyped } -> Symbol
-      def self.normalize: (String | Symbol name, untyped value) -> untyped
-      def self.registered?: (String | Symbol name) -> bool
-      def self.names: () -> Array[Symbol]
-    end
-
-    class Policy
-      class Rule
-        attr_reader cardinality: Symbol
-        attr_reader on_conflict: Symbol
-        attr_reader normalizer: Symbol
-      end
-
-      attr_reader name: String?
-      attr_reader format: String
-      attr_reader defaults: Rule
-      attr_reader flags: Hash[String, Rule]
-
-      def self.load: (String path) -> Policy
-      def initialize: (Hash[String, untyped] config) -> void
-      def rule_for: (String flag) -> Rule
-    end
-
-    module BuiltInPolicies
-      def self.names: () -> Array[Symbol]
-      def self.fetch: (String | Symbol name) -> Policy
-    end
-
-    module FlagFile
-      class Option
-        attr_reader flag: String
-        attr_reader value: String?
-        attr_reader raw: String
-        attr_reader line_number: Integer
-        attr_reader position: Integer
-        attr_reader binding: Symbol
-      end
-
-      class Document
-        attr_reader options: Array[Option]
-        attr_reader opaque_lines: Array[[Integer, Integer, String]]
-        attr_reader trailing_newline: bool
-      end
-
-      class Parser
-        class ParseError < ArgumentError
-        end
-
-        def parse: (String source) -> Document
-      end
-
-      class Conflict
-        attr_reader flag: String
-        attr_reader base: Array[Option]
-        attr_reader ours: Array[Option]
-        attr_reader theirs: Array[Option]
-      end
-
-      class Result
-        attr_reader output: String?
-        attr_reader conflicts: Array[Conflict]
-        attr_reader partial_output: String
-        def clean?: () -> bool
-        def success?: () -> bool
-      end
-
-      class ThreeWayMerger
-        def initialize: (base: String | Document, ours: String | Document, theirs: String | Document, policy: Policy) -> void
-        def merge: () -> Result
-      end
-    end
-  end
-end
-
-module Config::Merge
-  class ProviderAdapter
-    def initialize: (family: String | Symbol, ?dialect: String | Symbol, ?backend: String | Symbol, ?profile_id: String | Symbol, ?provider_id: String | Symbol) -> void
-    def merge3: (base: String, ours: String, theirs: String, ?metadata: Hash[Symbol, untyped]?) -> Hash[Symbol, untyped]
+    VERSION: String
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.13
+  version: 7.1.14
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.13
+        version: 7.1.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.13
+        version: 7.1.14
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.15
+        version: 3.1.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.15
+        version: 3.1.18
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -205,20 +205,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -301,10 +301,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.13
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.13/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.14
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.14/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/config-merge/7.1.13
+  documentation_uri: https://www.rubydoc.info/gems/config-merge/7.1.14
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/config-merge