unenviable 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9dbfdf593c2a476c5beb4953b42c7639d7e7c19
-  data.tar.gz: fbde9bb39e18cef233c4c42e536d455e042d1b79
+  metadata.gz: 0f978ca7d7ed85dc730f2fe78215720e823f3ca8
+  data.tar.gz: 35e8a1b471130a4ad368b3aef3d694c39070e666
 SHA512:
-  metadata.gz: da87b74b624115edfdde1b60d8123f2b59e8db0a13fad38a6c9377a0aef619919868c2e7b4248226f8e2ebb4856cb8f545ca8407ac2849e617b8c859768e34d2
-  data.tar.gz: 5cba249971d287875434546ffd0a16c772eb8b21ee4d3622291726f34329548210dfae13614557ea7083924ed5c94b87968b9480365d30a3b7c642cc70326f1c
+  metadata.gz: be7160d04bdbdd30ffdbc6a5d5f04d02f00e199f9b95f16fd760d68d81134ac4dfc2e3b0c33bf1267b986a8a052def00525aca1cb7f29d1a21dfc778e849ac60
+  data.tar.gz: 6e821162b27323a72ea05741ad0835c9c24a76a61fdaa1912f2f8209bd5ce40f714e0aca2264f2cd0d76b0a1d66b31c102e2c3bb525856edbe8375f87e6d1083

data/lib/unenviable.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'dotenv'
+require 'dotenv' if Gem::Specification::find_all_by_name('dotenv').any?
 require 'yaml'
 
 require 'unenviable/env_wrapper'
@@ -12,7 +12,7 @@ module Unenviable
 
   def self.check
     load_env_descriptions unless @env_list
-    Dotenv.load
+    Dotenv.load if Gem::Specification::find_all_by_name('dotenv').any?
     discrepancies = { required: [], optional: [], forbidden: [] }
 
     @env_list.each do |var, details|
@@ -39,6 +39,10 @@ module Unenviable
     Object.const_set(:ENV, wrapper)
   end
 
+  def self.remove_wrapper
+    ENV.restore_saved if ENV.respond_to?(:close_wrapper)
+  end
+
   def self.described?(key)
     @env_list.include?(key)
   end

data/lib/unenviable/env_wrapper.rb

@@ -5,12 +5,13 @@ module Unenviable
     def initialize
       @saved_env = ENV
       @closed = false
+      @missing_descriptions = []
     end
 
     def [](key)
-      failed "Requested ENV[#{key}] after initialization finished!" if @closed
+      fail "Requested ENV[#{key}] after initialization finished!" if @closed
       value = @saved_env[key]
-      fail "Requested ENV[#{key}] which has not been described!" unless Unenviable.described?(key)
+      @missing_descriptions << key unless Unenviable.described?(key)
       return value unless value.nil?
       'MISSING VALUE'
     end
@@ -19,8 +20,14 @@ module Unenviable
       @saved_env[key] = value
     end
 
+    def restore_saved
+      Object.send(:remove_const, :ENV)
+      Object.const_set(:ENV, @saved_env)
+    end
+
     def close_wrapper
       @closed = true
+      fail "Requested Keys [#{@missing_descriptions.join(', ')}] which are not described!" unless @missing_descriptions.empty?
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unenviable
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - K M Lawrence
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv