envkey 1.2.4 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f799266aa9cf4bc610eb405859d015785ae82a22c3c3736ad65ebd2846625662
-  data.tar.gz: 029bdce547ebbc179d30da9dd068ea263c01a9099285f9652c2919dfea3a751d
+  metadata.gz: 05a14e712cde0b3dbb31b1125885125a5258e84aed307789a629bd6349184210
+  data.tar.gz: 1fd5c14961f72c759fefadd6ae0e377d239ca7a098f579a02e0f80fdcd7d93a7
 SHA512:
-  metadata.gz: 265790bb046fef50a1f7b124bd8bef9810c83d83678fc00409a778de3aadf336deb94b7b67fe82fcb117cf532e62d33135bae29bb329b5c3843e129324fefa56
-  data.tar.gz: 7f105618223aed133ae780111f83c0a1220b535c0be6bc08bccc9a377246e6fb61e512bee04724b2fa6c932c8a2306440441399741861a98fb4e54f657f20d52
+  metadata.gz: 711308a311b66197246880e9afd034ad9fe8cb2caa056a764db5d88abf5e9ee8f3de59f223fbacf242f9d10397ec66d0c301735a9a15b002e5957820032ea182
+  data.tar.gz: 2831b6485bdc4b95f95e6306342f6686a30c94df01865eeff5b5ce40e81577f7aaf2c096dcb1ca18c593e3f60ae8c73011355141446217c0dd142c2c3bc6fe3a

data/lib/envkey.rb

@@ -1,10 +1,11 @@
 require "envkey/version"
+require "envkey/core"
 
-if defined?(Rails)
+Envkey::Core.load_env
+
+begin
   require "envkey/rails"
-else
-  require "envkey/core"
-  Envkey::Core.load_env
+rescue LoadError
 end
 
 

data/lib/envkey/core.rb

@@ -5,18 +5,27 @@ require 'envkey/fetch'
 
 module Envkey::Core
 
-  def self.load_env spring_pre_fork_ts=nil,
-                    overload_dotenv_vars=[],
-                    overload_envkey_vars=[]
+  def self.load_env
     original_env = ENV.to_h
-    dotenv_vars = Dotenv.load
+    dotenv_vars = Dotenv.parse
+
+    overwrite_dotenv_vars = JSON.parse(ENV["__ENVKEY_DOT_ENV_VARS"] || "[]")
+    overwrite_envkey_vars = JSON.parse(ENV["__ENVKEY_VARS"] || "[]")
+
     updated_dotenv_vars = dotenv_vars.keys.select do |k|
-      overload_dotenv_vars.include?(k) || original_env[k] == nil
+      (overwrite_dotenv_vars.include?(k) || original_env[k] == nil)
     end
-    overload_dotenv_vars.each do |k|
+    updated_dotenv_vars.each do |k|
       ENV[k] = dotenv_vars[k]
     end
 
+    key = ENV["ENVKEY"]
+
+    # handle changed ENVKEY
+    if key && updated_dotenv_vars.include?("ENVKEY") && key != original_env["ENVKEY"]
+      overwrite_envkey_vars.each {|var| ENV.delete(var) }
+    end
+
     if (key = ENV["ENVKEY"])
       res = Envkey::Fetch.fetch_env(key)
       if res && res.gsub("\n","").gsub("\r", "") != "" && !res.start_with?("error:")
@@ -24,13 +33,16 @@ module Envkey::Core
         updated_envkey_vars = []
         envs.each do |k,v|
           var = k.upcase
-          if !ENV[var] || overload_envkey_vars.include?(var)
+          if !ENV[var] || overwrite_envkey_vars.include?(var)
             updated_envkey_vars << var
             ENV[var] = v
           end
         end
 
-        return [Set.new(updated_dotenv_vars), Set.new(updated_envkey_vars)]
+        ENV["__ENVKEY_DOT_ENV_VARS"] = updated_dotenv_vars.to_json
+        ENV["__ENVKEY_VARS"] = updated_envkey_vars.to_json
+
+        return updated_dotenv_vars, updated_envkey_vars
       elsif res.start_with?("error:")
         STDERR.puts "envkey-fetch " + res
         raise "ENVKEY invalid. Couldn't load vars."

data/lib/envkey/rails.rb

@@ -1,18 +1,15 @@
 require "envkey/core"
+require "rails"
 
 module Envkey
   class Railtie < Rails::Railtie
-
     config.before_configuration do
       begin
         require "spring/commands"
-        ts = Time.now
-        overload_dotenv_vars, overload_envkey_vars = Envkey::Core.load_env
         Spring.after_fork do
-          Envkey::Core.load_env(ts, (overload_dotenv_vars || []), (overload_envkey_vars || []))
+          Envkey::Core.load_env
         end
       rescue LoadError
-        Envkey::Core.load_env
       end
     end
   end

data/lib/envkey/version.rb

@@ -1,4 +1,4 @@
 module Envkey
-  VERSION = "1.2.4"
-  ENVKEY_FETCH_VERSION="1.2.4"
+  VERSION = "1.2.6"
+  ENVKEY_FETCH_VERSION="1.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envkey
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.6
 platform: ruby
 authors:
 - Dane Schneider
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,30 +83,30 @@ files:
 - bin/console
 - bin/setup
 - envkey.gemspec
-- ext/envkey-fetch_1.2.4_darwin_386/LICENSE
-- ext/envkey-fetch_1.2.4_darwin_386/README.md
-- ext/envkey-fetch_1.2.4_darwin_386/envkey-fetch
-- ext/envkey-fetch_1.2.4_darwin_amd64/LICENSE
-- ext/envkey-fetch_1.2.4_darwin_amd64/README.md
-- ext/envkey-fetch_1.2.4_darwin_amd64/envkey-fetch
-- ext/envkey-fetch_1.2.4_freebsd_386/LICENSE
-- ext/envkey-fetch_1.2.4_freebsd_386/README.md
-- ext/envkey-fetch_1.2.4_freebsd_386/envkey-fetch
-- ext/envkey-fetch_1.2.4_freebsd_amd64/LICENSE
-- ext/envkey-fetch_1.2.4_freebsd_amd64/README.md
-- ext/envkey-fetch_1.2.4_freebsd_amd64/envkey-fetch
-- ext/envkey-fetch_1.2.4_linux_386/LICENSE
-- ext/envkey-fetch_1.2.4_linux_386/README.md
-- ext/envkey-fetch_1.2.4_linux_386/envkey-fetch
-- ext/envkey-fetch_1.2.4_linux_amd64/LICENSE
-- ext/envkey-fetch_1.2.4_linux_amd64/README.md
-- ext/envkey-fetch_1.2.4_linux_amd64/envkey-fetch
-- ext/envkey-fetch_1.2.4_windows_386/LICENSE
-- ext/envkey-fetch_1.2.4_windows_386/README.md
-- ext/envkey-fetch_1.2.4_windows_386/envkey-fetch.exe
-- ext/envkey-fetch_1.2.4_windows_amd64/LICENSE
-- ext/envkey-fetch_1.2.4_windows_amd64/README.md
-- ext/envkey-fetch_1.2.4_windows_amd64/envkey-fetch.exe
+- ext/envkey-fetch_1.2.6_darwin_386/LICENSE
+- ext/envkey-fetch_1.2.6_darwin_386/README.md
+- ext/envkey-fetch_1.2.6_darwin_386/envkey-fetch
+- ext/envkey-fetch_1.2.6_darwin_amd64/LICENSE
+- ext/envkey-fetch_1.2.6_darwin_amd64/README.md
+- ext/envkey-fetch_1.2.6_darwin_amd64/envkey-fetch
+- ext/envkey-fetch_1.2.6_freebsd_386/LICENSE
+- ext/envkey-fetch_1.2.6_freebsd_386/README.md
+- ext/envkey-fetch_1.2.6_freebsd_386/envkey-fetch
+- ext/envkey-fetch_1.2.6_freebsd_amd64/LICENSE
+- ext/envkey-fetch_1.2.6_freebsd_amd64/README.md
+- ext/envkey-fetch_1.2.6_freebsd_amd64/envkey-fetch
+- ext/envkey-fetch_1.2.6_linux_386/LICENSE
+- ext/envkey-fetch_1.2.6_linux_386/README.md
+- ext/envkey-fetch_1.2.6_linux_386/envkey-fetch
+- ext/envkey-fetch_1.2.6_linux_amd64/LICENSE
+- ext/envkey-fetch_1.2.6_linux_amd64/README.md
+- ext/envkey-fetch_1.2.6_linux_amd64/envkey-fetch
+- ext/envkey-fetch_1.2.6_windows_386/LICENSE
+- ext/envkey-fetch_1.2.6_windows_386/README.md
+- ext/envkey-fetch_1.2.6_windows_386/envkey-fetch.exe
+- ext/envkey-fetch_1.2.6_windows_amd64/LICENSE
+- ext/envkey-fetch_1.2.6_windows_amd64/README.md
+- ext/envkey-fetch_1.2.6_windows_amd64/envkey-fetch.exe
 - lib/envkey.rb
 - lib/envkey/core.rb
 - lib/envkey/fetch.rb