dotenv-merge 1.0.3 → 7.1.3

data/lib/dotenv-merge.rb

@@ -1,4 +1,12 @@
+# 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 "dotenv/merge"
+require 'dotenv/merge'
+require 'version_gem'
+require_relative 'dotenv/merge/version'
+
+Dotenv::Merge::Version.class_eval do
+  extend VersionGem::Basic
+end

data/sig/dotenv/merge.rbs

@@ -1,212 +1,27 @@
-# Type signatures for dotenv-merge gem
-# Smart merge for .env files using line-based analysis
-
 module Dotenv
   module Merge
-    VERSION: String
-
-    # Base error class for dotenv-merge
-    class Error < StandardError
-    end
-
-    # Raised when the template file cannot be parsed
-    class TemplateParseError < Error
-      attr_reader errors: Array[String]
-      attr_reader content: String?
-
-      def initialize: (Array[String] errors, ?content: String?) -> void
-    end
-
-    # Raised when the destination file cannot be parsed
-    class DestinationParseError < Error
-      attr_reader errors: Array[String]
-      attr_reader content: String?
-
-      def initialize: (Array[String] errors, ?content: String?) -> void
-    end
-
-    # Debug logging utility for Dotenv::Merge
-    module DebugLogger
-      extend Ast::Merge::DebugLogger
-
-      def self.env_var_name: () -> String
-      def self.env_var_name=: (String name) -> String
-      def self.log_prefix: () -> String
-      def self.log_prefix=: (String prefix) -> String
-      def self.enabled?: () -> bool
-      def self.debug: (String message, ?Hash[Symbol, untyped] context) -> void
-      def self.info: (String message) -> void
-      def self.warning: (String message) -> void
-      def self.time: [T] (String operation) { () -> T } -> T
-      def self.extract_node_info: (untyped node) -> Hash[Symbol, untyped]
-    end
-
-    # Represents a single line in a dotenv file
-    class EnvLine
-      attr_reader line_number: Integer
-      attr_reader raw: String
-      attr_reader key: String?
-      attr_reader value: String?
-      attr_reader comment: String?
-
-      def initialize: (
-        Integer line_number,
-        String raw,
-        ?key: String?,
-        ?value: String?,
-        ?comment: String?
-      ) -> void
-
-      def assignment?: () -> bool
-      def comment?: () -> bool
-      def blank?: () -> bool
-      def signature: () -> Array[Symbol | String]
-      def start_line: () -> Integer
-      def end_line: () -> Integer
-      def location: () -> Ast::Merge::FreezeNode::Location
-      def freeze_node?: () -> bool
-      def slice: () -> String
-      def to_s: () -> String
+    module Version
+      VERSION: String
     end
+    VERSION: String
 
-    # Represents a freeze block in a dotenv file
-    class FreezeNode < Ast::Merge::FreezeNode
-      InvalidStructureError: singleton(Ast::Merge::FreezeNode::InvalidStructureError)
-      Location: singleton(Ast::Merge::FreezeNode::Location)
-
-      attr_reader analysis: FileAnalysis
-      attr_reader lines: Array[EnvLine]
-      attr_reader reason: String?
+    BACKEND_REFERENCE: untyped
 
-      def initialize: (
-        start_line: Integer,
-        end_line: Integer,
-        analysis: FileAnalysis,
-        ?lines: Array[EnvLine]?,
-        ?reason: String?,
-        ?pattern_type: Symbol
-      ) -> void
+    def self.merge_provider: () -> Provider
+    def self.register_provider!: (?replace: bool) -> untyped
 
-      def content: () -> String
-      def signature: () -> Array[Symbol | String]
-      def env_lines: () -> Array[EnvLine]
-      def assignment?: () -> bool
-      def comment?: () -> bool
-      def slice: () -> String
-      def inspect: () -> String
+    class Provider
+      def provider_id: () -> String
+      def family: () -> String
+      def capabilities: () -> Hash[Symbol, untyped]
+      def analyze: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def diff2: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def merge2: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
+      def merge3: (Hash[Symbol, untyped] request) -> Hash[Symbol, untyped]
     end
 
-    # File analysis for dotenv files
     class FileAnalysis
-      include Ast::Merge::FileAnalysisBase
-
-      DEFAULT_FREEZE_TOKEN: String
-
-      attr_reader source: String
-      attr_reader lines: Array[EnvLine]
-      attr_reader freeze_token: String
-      attr_reader signature_generator: (^(EnvLine) -> Array[Symbol | String]?)?
-      attr_reader statements: Array[EnvLine | FreezeNode]
-      attr_reader freeze_blocks: Array[FreezeNode]
-
-      def initialize: (
-        String source,
-        ?freeze_token: String,
-        ?signature_generator: (^(EnvLine) -> Array[Symbol | String]?)?
-      ) -> void
-
-      def valid?: () -> bool
-      def nodes: () -> Array[EnvLine | FreezeNode]
-      def assignment_lines: () -> Array[EnvLine]
-      def line_at: (Integer line_number) -> String?
-      def normalized_line: (Integer line_num) -> String?
-      def in_freeze_block?: (Integer line_num) -> bool
-      def freeze_block_at: (Integer line_num) -> FreezeNode?
-      def signature_at: (Integer index) -> Array[Symbol | String]?
-      def generate_signature: (EnvLine | FreezeNode node) -> Array[Symbol | String]?
-      def compute_node_signature: (untyped node) -> Array[Symbol | String]?
-
-      private
-
-      def parse_lines: () -> Array[EnvLine]
-      def extract_freeze_blocks: () -> Array[FreezeNode]
-      def integrate_lines_and_freeze_blocks: () -> Array[EnvLine | FreezeNode]
-    end
-
-    # Result of a merge operation
-    class MergeResult < Ast::Merge::MergeResult
-      DECISION_KEPT_TEMPLATE: Symbol
-      DECISION_KEPT_DEST: Symbol
-      DECISION_MERGED: Symbol
-      DECISION_ADDED: Symbol
-      DECISION_FREEZE_BLOCK: Symbol
-
-      attr_reader template_analysis: FileAnalysis
-      attr_reader dest_analysis: FileAnalysis
-      attr_reader lines: Array[String]
-      attr_reader provenance: Array[Hash[Symbol, untyped]]
-      attr_reader decisions: Array[Hash[Symbol, untyped]]
-
-      def initialize: (
-        ?template_analysis: FileAnalysis?,
-        ?dest_analysis: FileAnalysis?,
-        ?conflicts: Array[Hash[Symbol, untyped]],
-        ?frozen_blocks: Array[FreezeNode],
-        ?stats: Hash[Symbol, untyped]
-      ) -> void
-
-      def add_line: (String line, Symbol origin, ?Integer? source_line) -> void
-      def add_env_line: (EnvLine env_line, Symbol decision) -> void
-      def add_freeze_block: (FreezeNode freeze_node) -> void
-      def to_s: () -> String
-      def to_dotenv: () -> String
-      def content: () -> Array[String]
-      def content_string: () -> String
-      def empty?: () -> bool
-    end
-
-    # Smart merger for dotenv files
-    class SmartMerger
-      include Ast::Merge::MergerConfig
-
-      attr_reader template_analysis: FileAnalysis
-      attr_reader dest_analysis: FileAnalysis
-      attr_reader signature_match_preference: (Symbol | Hash[Symbol, Symbol])
-      attr_reader add_template_only_nodes: bool
-
-      def initialize: (
-        String template_content,
-        String dest_content,
-        ?signature_match_preference: (Symbol | Hash[Symbol, Symbol]),
-        ?add_template_only_nodes: bool,
-        ?freeze_token: String,
-        ?signature_generator: (^(EnvLine) -> Array[Symbol | String]?)?,
-        ?node_splitter: Hash[Symbol, untyped]?
-      ) -> void
-
-      def merge: () -> MergeResult
-
-      private
-
-      def perform_merge: () -> MergeResult
-      def merge_lines: (MergeResult result) -> void
-    end
-
-    # Conflict resolver for dotenv merges
-    class ConflictResolver
-      attr_reader template_analysis: FileAnalysis
-      attr_reader dest_analysis: FileAnalysis
-      attr_reader signature_match_preference: (Symbol | Hash[Symbol, Symbol])
-      attr_reader add_template_only_nodes: bool
-
-      def initialize: (
-        FileAnalysis template_analysis,
-        FileAnalysis dest_analysis,
-        ?signature_match_preference: (Symbol | Hash[Symbol, Symbol]),
-        ?add_template_only_nodes: bool
-      ) -> void
-
-      def resolve: (untyped boundary, MergeResult result) -> void
+      attr_reader structural_diagnostics: Array[Hash[Symbol, untyped]]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotenv-merge
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 7.1.3
 platform: ruby
 authors:
 - Peter H. Boling
@@ -38,45 +38,47 @@ cert_chain:
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tree_haver
+  name: ast-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 7.1.3
   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
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
-  name: ast-merge
+  name: plain-merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ">="
+        version: 7.1.3
+- !ruby/object:Gem::Dependency
+  name: tree_haver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        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
@@ -86,7 +88,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.1.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,35 +98,41 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.1.15
 - !ruby/object:Gem::Dependency
   name: kettle-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -160,45 +168,85 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
-  name: appraisal2
+  name: anonymous_loader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "~>"
+        version: '0.1'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 0.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: appraisal2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 2.0.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 2.0.19
+- !ruby/object:Gem::Dependency
+  name: turbo_tests2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +270,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -232,84 +280,69 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: gitmoji-regex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 2.0.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
-description: "☯️ Dotenv::Merge provides smart .env file merging that preserves comments,
-  understands variable assignments, and supports freeze blocks for protecting sensitive
-  configuration. Perfect for merging environment templates with local overrides."
+        version: 2.0.11
+description: "☯️ Dotenv assignment, comment, freeze-block, and template merge behavior
+  for Structured Merge."
 email:
 - floss@galtzo.com
 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
+- LICENSE.md
 - README.md
-- REEK
-- RUBOCOP.md
-- SECURITY.md
 - lib/dotenv-merge.rb
 - lib/dotenv/merge.rb
+- lib/dotenv/merge/backend.rb
+- lib/dotenv/merge/comment_tracker.rb
 - lib/dotenv/merge/debug_logger.rb
 - lib/dotenv/merge/env_line.rb
 - lib/dotenv/merge/file_analysis.rb
 - lib/dotenv/merge/freeze_node.rb
 - lib/dotenv/merge/merge_result.rb
+- lib/dotenv/merge/provider.rb
 - lib/dotenv/merge/smart_merger.rb
 - lib/dotenv/merge/version.rb
 - sig/dotenv/merge.rbs
-- sig/dotenv/merge/env_line.rbs
-homepage: https://github.com/kettle-rb/dotenv-merge
+homepage: https://github.com/structuredmerge/structuredmerge-ruby
 licenses:
-- MIT
+- AGPL-3.0-only
+- PolyForm-Small-Business-1.0.0
 metadata:
-  homepage_uri: https://dotenv-merge.galtzo.com/
-  source_code_uri: https://github.com/kettle-rb/dotenv-merge/tree/v1.0.3
-  changelog_uri: https://github.com/kettle-rb/dotenv-merge/blob/v1.0.3/CHANGELOG.md
-  bug_tracker_uri: https://github.com/kettle-rb/dotenv-merge/issues
-  documentation_uri: https://www.rubydoc.info/gems/dotenv-merge/1.0.3
+  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
+  bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
+  documentation_uri: https://www.rubydoc.info/gems/dotenv-merge/7.1.3
   funding_uri: https://github.com/sponsors/pboling
-  wiki_uri: https://github.com/kettle-rb/dotenv-merge/wiki
+  wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/dotenv-merge
   discord_uri: https://discord.gg/3qme4XHNKN
+  mailing_list_uri: https://www.rubyforum.org/tag/structuredmerge
   rubygems_mfa_required: 'true'
 rdoc_options:
 - "--title"
-- dotenv-merge - ☯️ Intelligent .env file merging using structured parsing
+- dotenv-merge - ☯️ Structured Merge dotenv analysis and merge for Ruby
 - "--main"
 - README.md
 - "--exclude"
@@ -323,14 +356,14 @@ 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.17
 specification_version: 4
-summary: "☯️ Intelligent .env file merging using structured parsing"
+summary: "☯️ Structured Merge dotenv analysis and merge for Ruby"
 test_files: []