dotenvx 4.0.6-x86_64-linux → 5.0.1-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a211e3510b8c548dd2c35e2fc818d5550ae8df731766918345d372963bcee382
-  data.tar.gz: 472897b244350b8a95fa3b39be0283a53e14f16e6e3263abd7ae80b010029cae
+  metadata.gz: 6356610995fb7ce61fd3fb43c8351729e3f1cbb65cf6381eef51f473e4d92e04
+  data.tar.gz: 1faadb43c667477e7935fd245a014ce96ab4b4cc257040427a5ad506caeaf5f6
 SHA512:
-  metadata.gz: 63a8bab5e3ba7655be5ef699ef52567df63966b70c3511f8ddd8f895f96f7200c13fa6d8fc62a017e012b672edbbb1415843af2139ab37febbaf6f99570ae9a0
-  data.tar.gz: 266cf24f3e2b10fe7d1800308bf929047bf41f7e69ed1cb61dd12dde4dd551d0435346d060e25ac7b8b8946fc926468b44ffeec8123715c11decc91fa5200adc
+  metadata.gz: c452e456015cc94b226855eda918d9c2512cb81b313bb7528a27372b539134581be80be20506816f0b6387c66ba6b3a7a1f856c3e8a5331ee760f445dcdf8787
+  data.tar.gz: 2ce7da8ac617f68188f34611888856deea5be66b285452500d1ed66fe1e6c9972698954c94dcc1379ba6c3f89675703377f992e59646ba1497457a85adcfae1e

data/CHANGELOG.md

@@ -2,18 +2,18 @@
 
 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.5...main)
+## Unreleased
 
-## [4.0.5](https://github.com/dotenvx/dotenvx-ruby/compare/v4.0.4...v4.0.5)
+## 4.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)
+## 4.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)
+## 4.0.0
 
 - Load plaintext and encrypted dotenv files through `dotenvx-primitives`.
 - Bundle the Rust implementation as a Magnus native extension.

data/README.md

@@ -2,10 +2,9 @@
 
 *a secure dotenv–from the creator of [`dotenv`](https://github.com/motdotla/dotenv).*
 
-`dotenvx` loads plaintext and encrypted dotenv files through the shared
-[`dotenvx-primitives`](https://crates.io/crates/dotenvx-primitives) Rust
-implementation. The native extension is bundled in the gem; users do not need
-Node.js, a dotenvx CLI, or a Rust toolchain.
+`dotenvx` loads plaintext and encrypted dotenv files through the shared `dotenvx-sdk` Rust loader, backed by published
+[`dotenvx-primitives`](https://crates.io/crates/dotenvx-primitives). The native extension is bundled in the gem; users do not need
+Node.js or a Rust toolchain.
 
 ## Install
 
@@ -61,14 +60,10 @@ Raise when a file is missing:
 Dotenvx.load!(".env")
 ```
 
-Require configuration keys:
-
-```ruby
-Dotenvx.require_keys("DATABASE_URL", "SECRET_KEY")
-```
-
-Encrypted values are decrypted automatically when the matching private key is
-available through the process environment, `<filename>.keys`, or `.env.keys`.
+Encrypted values are decrypted automatically with keys from the process
+environment, `<filename>.keys`, or `.env.keys`. For keys in Armor, 1Password,
+or another custody provider, install a dotenvx CLI with `command-sdk` and the
+matching feature.
 
 ## Native platforms
 
@@ -81,3 +76,24 @@ Tagged releases publish variants of the same `dotenvx` gem for:
 - Windows x64
 
 RubyGems selects the correct variant during `gem install dotenvx`.
+
+## Loading errors and policy
+
+Loading errors are reported and loading continues by default. `strict: true`,
+`load!` stops loading and raises before updating `ENV`. Selected error codes
+can be ignored with `ignore: ["CODE"]`.
+
+The shared loader returns redaction metadata without changing real application
+values. Application-output redaction hooks are not installed by this adapter.
+
+## Shared file selection
+
+File discovery, directory expansion, conventions, and key-based filename
+inference are resolved by `dotenvx-sdk`. The CLI's file-selection and error-ignore
+environment variables apply here too. Rails supplies its root and environment;
+the shared loader chooses the Rails files and their order.
+
+```ruby
+Dotenvx.load(convention: "nextjs")
+Dotenvx.load("app", key_files: "shared/.env.keys")
+```

data/lib/dotenvx/rails.rb

@@ -39,25 +39,12 @@ module Dotenvx
     def load
       return if @loaded
 
-      Dotenvx.load(*dotenvx_files)
+      Dotenvx.load(root.to_s, convention: "rails", environment: Rails.env.to_s)
       @loaded = true
     end
 
     private
 
-    def dotenvx_files
-      environment = Rails.env
-      files = [
-        root.join(".env.#{environment}.local")
-      ]
-      files << root.join(".env.local") unless environment == "test"
-      files.concat([
-        root.join(".env.#{environment}"),
-        root.join(".env")
-      ])
-      files
-    end
-
     def root
       Pathname.new(Rails.root || ENV["RAILS_ROOT"] || Dir.pwd)
     end

data/lib/dotenvx/version.rb

@@ -1,3 +1,3 @@
 module Dotenvx
-  VERSION = "4.0.6"
+  VERSION = "5.0.1"
 end

data/lib/dotenvx.rb

@@ -1,18 +1,8 @@
 require "dotenvx/version"
 require "dotenvx/dotenvx_native"
 require "json"
-require "pathname"
 
 module Dotenvx
-  class MissingKeys < RuntimeError
-    attr_reader :keys
-
-    def initialize(keys)
-      @keys = keys
-      super("Missing required configuration keys: #{keys.join(", ")}")
-    end
-  end
-
   class ParseError < RuntimeError
     attr_reader :code
 
@@ -25,15 +15,18 @@ module Dotenvx
   class << self
     attr_accessor :instrumenter
 
-    def load(*filenames, overwrite: false, ignore: true, strict: false)
-      env, injected_keys, loaded_paths = parse_files(
+    def load(*filenames, overwrite: false, ignore: [], strict: false, convention: nil, environment: nil, key_files: nil)
+      env, summary = parse_files(
         *filenames,
         overwrite: overwrite,
         ignore: ignore,
-        strict: strict
+        strict: strict,
+        convention: convention,
+        environment: environment,
+        key_files: key_files
       )
       changed = update(env, overwrite: overwrite)
-      log_injected(injected_keys, loaded_paths)
+      warn summary
       changed
     end
 
@@ -51,12 +44,15 @@ module Dotenvx
     end
     alias overload! overwrite!
 
-    def parse(*filenames, overwrite: false, ignore: true, strict: false)
+    def parse(*filenames, overwrite: false, ignore: [], strict: false, convention: nil, environment: nil, key_files: nil)
       parse_files(
         *filenames,
         overwrite: overwrite,
         ignore: ignore,
-        strict: strict
+        strict: strict,
+        convention: convention,
+        environment: environment,
+        key_files: key_files
       ).first
     end
 
@@ -80,83 +76,34 @@ module Dotenvx
       changed
     end
 
-    def require_keys(*keys)
-      missing = keys.flatten.map(&:to_s) - ENV.keys
-      raise MissingKeys, missing unless missing.empty?
-    end
-
     private
 
-    def parse_files(*filenames, overwrite: false, ignore: true, strict: false)
-      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_missing?(ignore)
-          next accumulator
-        end
-
-        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
-        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 handle_errors(errors, ignore:, strict:)
+    def parse_files(*filenames, overwrite: false, ignore: [], strict: false, convention: nil, environment: nil, key_files: nil)
+      filenames = filenames.flatten
       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?
-        paths = loaded_paths.map { |path| readable_path(path) }
-        message = "#{message} from #{paths.join(", ")}"
+      ignored_codes << "MISSING_ENV_FILE" if ignore == true
+      result = JSON.parse(Native.load_env(JSON.generate(
+        sources: filenames.map { |filename| { type: "file", value: filename.to_s } },
+        cwd: Dir.pwd,
+        convention: convention,
+        environment_name: environment,
+        key_files: key_files.nil? ? nil : Array(key_files).map(&:to_s),
+        process_env: ENV.to_h,
+        overload: overwrite == true,
+        strict: strict,
+        ignore: ignored_codes,
+        adjacent_keys: true
+      )))
+      result.fetch("diagnostics").each do |error|
+        if error.fetch("strict")
+          if error["code"] == "MISSING_ENV_FILE" && ignore == false
+            raise Errno::ENOENT, error["path"]
+          end
+          raise ParseError.new(error.fetch("code"), error.fetch("message"))
+        end
+        warn "☠ #{error.fetch("message")}"
       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) }
-        .uniq
+      [result.fetch("values"), result.fetch("inject_summary")]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotenvx
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 5.0.1
 platform: x86_64-linux
 authors:
 - motdotla
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-09-11 00:00:00.000000000 Z
+date: 2026-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,13 +81,13 @@ files:
 - lib/dotenvx/load.rb
 - lib/dotenvx/rails.rb
 - lib/dotenvx/version.rb
-homepage: https://github.com/dotenvx/dotenvx-ruby
+homepage: https://dotenvx.com
 licenses:
 - BSD-3-Clause
 metadata:
-  homepage_uri: https://github.com/dotenvx/dotenvx-ruby
-  source_code_uri: https://github.com/dotenvx/dotenvx-ruby
-  changelog_uri: https://github.com/dotenvx/dotenvx-ruby
+  homepage_uri: https://dotenvx.com
+  source_code_uri: https://github.com/dotenvx/dotenvx
+  changelog_uri: https://github.com/dotenvx/dotenvx
 post_install_message:
 rdoc_options: []
 require_paths: