dotenvx 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbc11188493670e456723d7d984cb3118d3c9e3abaaba8652a5650f9b99c7d14
-  data.tar.gz: eaa5409b065a89f9105109f3b955f0ae68c43e137c7a35cd99103fe290572240
+  metadata.gz: 064bf1a8af2ec748d2b4ee03c0dae6b81dd87b7816b090340f6f3b14634c3d42
+  data.tar.gz: 14d620741ee83316f1f94201815adf6b23af7ce97706a6cc479991d383ed4678
 SHA512:
-  metadata.gz: 31b8875875fa83cdb13ff2ec5a3660ce9cf637c5eed17aa1cfa7ea3d66ab0ca451f5d8a9c1d31f6c7b0f739e0767b3e361e77b6e1b814660e4591886e931011c
-  data.tar.gz: 720420e1e1f2018215c47d9b1064449ca6699b277bcc3cdfc6f4506f69b45d2255dc433b4182118a398ecf5578d8b3c6fd68e93c0faaf426b4533bb95c38f7dd
+  metadata.gz: 92653db2d9c3f96a6759e4593781bc62dafd9a4c02dab83514e9d8c24f108dcf4df846ad315fd70d4566d02e16a215f8119578705ce3ecb25a070fdc65c378a4
+  data.tar.gz: 022b6ed8bc4aca5cd7223511da36cfed75f7e9738430ba7f00cce84b7f8ef0f62b22f2d3da78d81a7eb7b3bc4a1bb12d3118786cb031fadac37fef7a9e8a35eb

data/CHANGELOG.md

@@ -2,7 +2,11 @@
 
 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.0...main)
+## [Unreleased](https://github.com/dotenvx/dotenvx-ruby/compare/v4.0.4...main)
+
+## [4.0.4](https://github.com/dotenvx/dotenvx-ruby/compare/v4.0.3...v4.0.4)
+
+- Report the unique variables injected from readable dotenv files.
 
 ## [4.0.0](https://github.com/dotenvx/dotenvx-ruby/compare/v0.0.2...v4.0.0)
 

data/Cargo.lock

@@ -222,7 +222,7 @@ dependencies = [
 
 [[package]]
 name = "dotenvx_native"
-version = "4.0.3"
+version = "4.0.4"
 dependencies = [
  "dotenvx-primitives",
  "magnus",

data/ext/dotenvx/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dotenvx_native"
-version = "4.0.3"
+version = "4.0.4"
 edition = "2021"
 rust-version = "1.83"
 publish = false

data/lib/dotenvx/rails.rb

@@ -37,7 +37,10 @@ module Dotenvx
     config.before_configuration { Dotenvx::Railtie.instance.load }
 
     def load
+      return if @loaded
+
       Dotenvx.load(*dotenvx_files)
+      @loaded = true
     end
 
     private

data/lib/dotenvx/version.rb

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

data/lib/dotenvx.rb

@@ -1,6 +1,7 @@
 require "dotenvx/version"
 require "dotenvx/dotenvx_native"
 require "json"
+require "pathname"
 
 module Dotenvx
   class MissingKeys < RuntimeError
@@ -16,8 +17,14 @@ module Dotenvx
     attr_accessor :instrumenter
 
     def load(*filenames, overwrite: false, ignore: true)
-      env = parse(*filenames, overwrite: overwrite, ignore: ignore)
-      update(env, overwrite: overwrite)
+      env, injected_keys, loaded_paths = parse_files(
+        *filenames,
+        overwrite: overwrite,
+        ignore: ignore
+      )
+      changed = update(env, overwrite: overwrite)
+      log_injected(injected_keys, loaded_paths)
+      changed
     end
 
     def load!(*filenames)
@@ -35,31 +42,7 @@ module Dotenvx
     alias overload! overwrite!
 
     def parse(*filenames, overwrite: false, ignore: true)
-      filenames = [".env"] if filenames.empty?
-      filenames = filenames.flatten.reverse if overwrite
-
-      process_env = ENV.to_h
-      filenames.reduce({}) do |values, filename|
-        path = File.expand_path(filename)
-        begin
-          source = File.binread(path).sub(/\A\xEF\xBB\xBF/, "").force_encoding(Encoding::UTF_8)
-        rescue Errno::ENOENT, Errno::EISDIR
-          raise unless ignore
-          next values
-        end
-
-        parsed, = Native.parse_dotenv(JSON.generate(
-          source: source,
-          process_env: process_env,
-          overwrite: overwrite == true,
-          key_files: key_files(path)
-        ))
-        parsed = parsed.to_h
-        process_env.merge!(parsed)
-        values.merge!(parsed)
-        yield Environment.new(path, parsed) if block_given?
-        values
-      end
+      parse_files(*filenames, overwrite: overwrite, ignore: ignore).first
     end
 
     def update(env = {}, overwrite: false)
@@ -89,6 +72,56 @@ module Dotenvx
 
     private
 
+    def parse_files(*filenames, overwrite: false, ignore: true)
+      filenames = [".env"] if filenames.empty?
+      filenames = filenames.flatten.reverse if overwrite
+
+      process_env = ENV.to_h
+      injected_keys = {}
+      loaded_paths = []
+      values = filenames.reduce({}) do |accumulator, filename|
+        path = File.expand_path(filename)
+        begin
+          source = File.binread(path).sub(/\A\xEF\xBB\xBF/, "").force_encoding(Encoding::UTF_8)
+        rescue Errno::ENOENT, Errno::EISDIR
+          raise unless ignore
+          next accumulator
+        end
+
+        parsed, injected = Native.parse_dotenv(JSON.generate(
+          source: source,
+          process_env: process_env,
+          overwrite: overwrite == true,
+          key_files: key_files(path)
+        ))
+        parsed = parsed.to_h
+        injected.each { |key, _value| injected_keys[key] = true }
+        loaded_paths << path
+        process_env.merge!(parsed)
+        accumulator.merge!(parsed)
+        yield Environment.new(path, parsed) if block_given?
+        accumulator
+      end
+      [values, injected_keys.keys, loaded_paths]
+    end
+
+    def log_injected(injected_keys, loaded_paths)
+      message = "⟐ injected env (#{injected_keys.length})"
+      unless loaded_paths.empty?
+        paths = loaded_paths.map { |path| readable_path(path) }
+        message = "#{message} from #{paths.join(", ")}"
+      end
+      warn message
+    end
+
+    def readable_path(path)
+      pathname = Pathname.new(path)
+      relative = pathname.relative_path_from(Pathname.pwd).to_s
+      relative.start_with?("../") ? pathname.to_s : relative
+    rescue ArgumentError
+      pathname.to_s
+    end
+
     def key_files(path)
       candidates = ["#{path}.keys", File.join(File.dirname(path), ".env.keys")]
       candidates.select { |candidate| File.file?(candidate) }

metadata

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