dotenv-vault-rails 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca7df12c2227ad12516a6f7372854f0fc7b31db5d34ab6aca23845a316adb06e
-  data.tar.gz: 2602498218cc915c9d39f60d12e2542994e63a592cd0d440ea1f070e01881e59
+  metadata.gz: 4fd6eab8f7ad51c5b1f2b33187eddbcfe000b95e74538fce3d08850990ec5f76
+  data.tar.gz: 20d9bf1e87a3e2c3cd863ad47ecfd8ed7db6608bccc78828da8b38a23f901f0c
 SHA512:
-  metadata.gz: '09f0097149ae52f3a0271384fee27e6843d0fe92989889d3662911ea96d214be3ea53088a096497b6e1f61da4e1977deb30592d034d80fc6dc4b5f9b3ec477fe'
-  data.tar.gz: 6d6baf8ec4d6be0dd8344856a12e02e5a720836bd35a22dee144d68a25a617947fe198d39d36909c590504c784ee5f2f245e4827e1c74b43880870fd9159a383
+  metadata.gz: 4f41e45e09a9f1c97bfc4fa64b0e4322bbd917e30e827b886f80d23d28287aaa894957a27a17b28d119fcf59c741a60b5794fb3dc67dc42c8c77af5b94a4ae43
+  data.tar.gz: 95f221dfd6927d2a04d359079a51a6493d0fc05ba6a79324c1cf5a65e2c2aa31097a1cb1590ec2639623443b8617dc6600592c21db50214dc8f1af9eb57d687c

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    dotenv-vault (0.5.0)
+    dotenv-vault (0.7.0)
       dotenv
       lockbox
-    dotenv-vault-rails (0.5.0)
+    dotenv-vault-rails (0.7.0)
       dotenv-rails
-      dotenv-vault (= 0.5.0)
+      dotenv-vault (= 0.7.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/dotenv-vault/version.rb

@@ -1,3 +1,3 @@
 module DotenvVault
-  VERSION = "0.5.0"
+  VERSION = "0.7.0"
 end

data/lib/dotenv-vault.rb

@@ -1,6 +1,8 @@
+require "uri"
 require "dotenv"
 require "lockbox"
 require "dotenv-vault/version"
+require "logger"
 
 module DotenvVault
   class NotFoundDotenvKey < ArgumentError; end
@@ -13,6 +15,10 @@ module DotenvVault
 
   class << self
     attr_accessor :instrumenter
+
+    def logger
+      @logger ||= Logger.new(STDOUT)
+    end
   end
 
   module_function
@@ -84,6 +90,8 @@ module DotenvVault
   #
   # Decrypts and loads to ENV
   def load_vault(*filenames)
+    DotenvVault.logger.info("[dotenv-vault] Loading .env.vault") if DotenvVault.logger
+
     parsed = parse_vault(*filenames)
     
     # Set ENV
@@ -96,6 +104,8 @@ module DotenvVault
   #
   # Decrypts and overloads to ENV
   def overload_vault(*filenames)
+    DotenvVault.logger.info("[dotenv-vault] Overloading .env.vault") if DotenvVault.logger
+
     parsed = parse_vault(*filenames)
     
     # Set ENV
@@ -109,15 +119,22 @@ module DotenvVault
     #
     # Warn the developer unless formatted correctly
     raise NotFoundDotenvKey, "NOT_FOUND_DOTENV_KEY: Cannot find ENV['DOTENV_KEY']" unless present?(ENV["DOTENV_KEY"])
-    split_dotenv_key = ENV["DOTENV_KEY"].split("/")
-    environment = split_dotenv_key[0]
-    raise InvalidDotenvKey, "INVALID_DOTENV_KEY: Missing environment part" unless present?(environment)
-    key = split_dotenv_key[1]
+
+    # Parse DOTENV_KEY. Format is a URI
+    uri = URI.parse(ENV["DOTENV_KEY"]) # dotenv://:key_1234@dotenv.org/vault/.env.vault?environment=production
+
+    # Get decrypt key
+    key = uri.password
     raise InvalidDotenvKey, "INVALID_DOTENV_KEY: Missing key part" unless present?(key)
 
-    # Locate .env.vault
-    vault_path = ".env.vault"
-    raise NotFoundDotenvVault, "NotFoundDotenvVault: Cannot find .env.vault at ${vaultPath}" unless File.file?(vault_path)
+    # Get environment
+    params = Hash[URI::decode_www_form(uri.query.to_s)]
+    environment = params["environment"]
+    raise InvalidDotenvKey, "INVALID_DOTENV_KEY: Missing environment part" unless present?(environment)
+
+    # Get vault path
+    vault_path = uri.path.gsub("/vault/", "") # /vault/.env.vault => .env.vault
+    raise NotFoundDotenvVault, "NotFoundDotenvVault: Cannot find .env.vault at #{vaultPath}" unless File.file?(vault_path)
 
     # Parse .env.vault
     parsed = Dotenv.parse(vault_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotenv-vault-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - motdotla
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: spring
   requirement: !ruby/object:Gem::Requirement