dotenv-vault 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f07ef0e741df42c7269f9d949e3b279bc2e244f030b8d2abd3b1cfd49d707d4f
-  data.tar.gz: c5ebb287fbd0de6d76ba888aea9fab96763329bcb9db19c86444d2b1e9b6d4ed
+  metadata.gz: aa34c1f736b3d975ebfa6908c4fd2fda654195397eacd4f49b87c740730665e3
+  data.tar.gz: bd4422daf3d333171025198d72e69e844d22a692f251beb18ddf435d9915a64f
 SHA512:
-  metadata.gz: 62a9f140d67de2990e183616d6075dbcabddbef118a3a7b91e85e237d6673b02b0136af95661b0f239d62a3cf217956184c8b4532f04b1aeef60e02878860552
-  data.tar.gz: d904872c3b6c27e5dd71a8ed31703fbbe8765e8cf212ebdadba04932b5addf10672284d0d15a816cacdce1607c45d9048b7bdac1ee8e83a1402d7e03b8f3d26d
+  metadata.gz: 004b6558fd5609bf8bbd2839efb586c49f6037a4834a6b50487350d9f203d389ad9d0a25372b902ded05b839db021f649918cc5b3626b2f9acadc6aaf74631ff
+  data.tar.gz: 791957d771aa5f0d0eab157730ad96ee9249a95a5ea2ca7525f30657b0d62e08fc9996e852faccd0b7ee41389df08bd6d38457fb3b223804c27bbb8fefbaeb32

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
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - motdotla