dotenvx 4.0.4-x86_64-linux → 4.0.5-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14095c7899171dcbb45b14711132a5068a96d8ae4580cb86b246b1fe31030fe9
-  data.tar.gz: 7c1439bbe811b8c0ecc74bd91f1a61efebb7c03151c08a5c433c6b1066f9244c
+  metadata.gz: eed8288974a56e99bb64dc3c42e68a8e29b6fe7dfc28ac2509a6c34ec6c9cdfe
+  data.tar.gz: 248c383166ac9a268f2ea1724cf733eaf7bb71587e297662bf7fe518b558f8a5
 SHA512:
-  metadata.gz: 2982fba1ca04aefc890942811a3c5d026a46c996878fe6b2c9f91f1b06d4e7993d7397a4dcfe279f841c4bfa334338387f08870c6a72ecc6d7659439c5067b19
-  data.tar.gz: c996d9f01c37051a7284b7fa8a64b512f0fab328bd3bb3086003b5b04106243414184245085e118d2ea0861d5eb4ed60ab6acde32ff778997fe1b33ef7837b0d
+  metadata.gz: d378737dbc885ce124e8072a846234a2c08f15be242b84aace2deabdd70c2818d47c31fb3eae4f2e8ba843fc86fba6628a5d6fac79d5ac423f458c2ee392b815
+  data.tar.gz: 0060ab3dc3fdc4c6ae2a61d8eaecd9bbdb355a76a0bff013634a667989bfd2652fb08437ab229b15a1a5dad16b71fb39c12acef00ee9fc34dc9fa9a39ca35803

data/CHANGELOG.md

@@ -2,7 +2,12 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [Unreleased](https://github.com/dotenvx/dotenvx-ruby/compare/v4.0.4...main)
+## [Unreleased](https://github.com/dotenvx/dotenvx-ruby/compare/v4.0.5...main)
+
+## [4.0.5](https://github.com/dotenvx/dotenvx-ruby/compare/v4.0.4...v4.0.5)
+
+- Continue after parse and decryption errors by default, with strict and
+  error-code ignore options for callers that need them.
 
 ## [4.0.4](https://github.com/dotenvx/dotenvx-ruby/compare/v4.0.3...v4.0.4)
 

data/lib/dotenvx/version.rb

@@ -1,3 +1,3 @@
 module Dotenvx
-  VERSION = "4.0.4"
+  VERSION = "4.0.5"
 end

data/lib/dotenvx.rb

@@ -13,14 +13,24 @@ module Dotenvx
     end
   end
 
+  class ParseError < RuntimeError
+    attr_reader :code
+
+    def initialize(code, message)
+      @code = code
+      super(message)
+    end
+  end
+
   class << self
     attr_accessor :instrumenter
 
-    def load(*filenames, overwrite: false, ignore: true)
+    def load(*filenames, overwrite: false, ignore: true, strict: false)
       env, injected_keys, loaded_paths = parse_files(
         *filenames,
         overwrite: overwrite,
-        ignore: ignore
+        ignore: ignore,
+        strict: strict
       )
       changed = update(env, overwrite: overwrite)
       log_injected(injected_keys, loaded_paths)
@@ -28,7 +38,7 @@ module Dotenvx
     end
 
     def load!(*filenames)
-      load(*filenames, ignore: false)
+      load(*filenames, ignore: false, strict: true)
     end
 
     def overwrite(*filenames)
@@ -37,12 +47,17 @@ module Dotenvx
     alias overload overwrite
 
     def overwrite!(*filenames)
-      load(*filenames, overwrite: true, ignore: false)
+      load(*filenames, overwrite: true, ignore: false, strict: true)
     end
     alias overload! overwrite!
 
-    def parse(*filenames, overwrite: false, ignore: true)
-      parse_files(*filenames, overwrite: overwrite, ignore: ignore).first
+    def parse(*filenames, overwrite: false, ignore: true, strict: false)
+      parse_files(
+        *filenames,
+        overwrite: overwrite,
+        ignore: ignore,
+        strict: strict
+      ).first
     end
 
     def update(env = {}, overwrite: false)
@@ -72,7 +87,7 @@ module Dotenvx
 
     private
 
-    def parse_files(*filenames, overwrite: false, ignore: true)
+    def parse_files(*filenames, overwrite: false, ignore: true, strict: false)
       filenames = [".env"] if filenames.empty?
       filenames = filenames.flatten.reverse if overwrite
 
@@ -84,16 +99,17 @@ module Dotenvx
         begin
           source = File.binread(path).sub(/\A\xEF\xBB\xBF/, "").force_encoding(Encoding::UTF_8)
         rescue Errno::ENOENT, Errno::EISDIR
-          raise unless ignore
+          raise unless ignore_missing?(ignore)
           next accumulator
         end
 
-        parsed, injected = Native.parse_dotenv(JSON.generate(
+        parsed, injected, errors = Native.parse_dotenv(JSON.generate(
           source: source,
           process_env: process_env,
           overwrite: overwrite == true,
           key_files: key_files(path)
         ))
+        handle_errors(errors, ignore: ignore, strict: strict)
         parsed = parsed.to_h
         injected.each { |key, _value| injected_keys[key] = true }
         loaded_paths << path
@@ -105,6 +121,21 @@ module Dotenvx
       [values, injected_keys.keys, loaded_paths]
     end
 
+    def handle_errors(errors, ignore:, strict:)
+      ignored_codes = Array(ignore).grep(String)
+      errors.each do |code, message|
+        next if ignored_codes.include?(code)
+
+        raise ParseError.new(code, message) if strict
+
+        warn "☠ #{message}"
+      end
+    end
+
+    def ignore_missing?(ignore)
+      ignore == true || Array(ignore).map(&:to_s).include?("MISSING_ENV_FILE")
+    end
+
     def log_injected(injected_keys, loaded_paths)
       message = "⟐ injected env (#{injected_keys.length})"
       unless loaded_paths.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotenvx
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: x86_64-linux
 authors:
 - motdotla