dotenvx 4.0.1-aarch64-linux → 4.0.4-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da018e0fd6a44ee8e8de780d49ec23cf3e564a522e35b46684a8ecdd7e0b29d5
-  data.tar.gz: 0dec0df0b1622c8f4a5e2bec536dcf81addd787453584e8fc943b01a7acc9708
+  metadata.gz: 175831972b38370f6dd9d99f66f4c290c6a8671bc19eb54a3feb5036f4ec1932
+  data.tar.gz: 21662fb9e6fa46ae773d1211b584cd27cd3bc8513d1a666fa20c0fd02557c034
 SHA512:
-  metadata.gz: 86a4a56837034aeaf2faabee353d89660543706aa15af5cef7568b7287196a139fdaf959f36e560c6b879f70fc77100d65dfefeda07324539c93f8155cbd13ee
-  data.tar.gz: 8b24f4e00adbaed36106e537897e3d22b8ac4c83116f045c476fc0acaa8babd1a121af390732def69e0658da740f4d81e2a2073029681afd08bcd8bfbaa06977
+  metadata.gz: c77e0e64712d1b1bbbb6993d790b8b2b9d0cfdda7ce4e1154d5457559991f6150ee8d01fd337e1bea5f5235b77ea86962cb9e973a139d25c0081ee78a96c0d35
+  data.tar.gz: 593b316496aa977d8cd133ce203f9904ef4a571c4f651ea375feed11110ff652a315acecb001e1754534d7bc65143c17fe69cddd5c0aafac238fbacd4bab5524

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/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.1"
+  VERSION = "4.0.4"
 end

data/lib/dotenvx.rb

@@ -1,5 +1,7 @@
 require "dotenvx/version"
 require "dotenvx/dotenvx_native"
+require "json"
+require "pathname"
 
 module Dotenvx
   class MissingKeys < RuntimeError
@@ -15,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)
@@ -34,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(
-          source,
-          process_env.to_a,
-          overwrite == true,
-          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)
@@ -88,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.1
+  version: 4.0.4
 platform: aarch64-linux
 authors:
 - motdotla