envkey 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b78f4806d12bd235d5f3aea9f6630a58e79b02a1
-  data.tar.gz: d18595b35cb9de8e7e113d88af83d655411af440
+  metadata.gz: 10e6bcd4fd2315011afab684c5cdf0a5d312e323
+  data.tar.gz: a6ac1ebe0132ab81ce7b54a518ae70d9b2604f8c
 SHA512:
-  metadata.gz: 6fde66600f0e000e2f6154575726140ebe68eb4ea9c8307b1e6fdef66c5e3a06aac70c6743fb4337a920f7febaf96939eff7a010d0ee9d306635dcb74b9c0a87
-  data.tar.gz: c6cfcab36d74a6ef1e90693aa3c27556b79d111b04cfd6548ea7c7d5a6c032a513d1da9dc5496d45d3e394a9f99afeeb3559a6433cab60532eeb6e34749fc8a3
+  metadata.gz: f4c306aa7c74847060d4e7087b4f729efcb074eb7a863cc45e5f52a7184fce3a156473e153d2c6516ce6990fcb615f743f6949a63fba00738554f9c74431058c
+  data.tar.gz: 99be5b26009749a9a4a3a429418a2878a4b1fb009fc37c12e61d949fe6c29f190c9eea4352a70c16d6c7927ee8eef3123724524d9135d3356dd338a1a209747a

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/ext/envkey.go

@@ -5,7 +5,6 @@ import (
   "bytes"
   "strings"
   "net/http"
-  // "fmt"
   "encoding/json"
   "io/ioutil"
   "log"
@@ -42,7 +41,8 @@ func EnvJson(envkey *C.char) *C.char {
 func getJson(url string, target interface{}) error {
   r, err := http.Get(url)
   if err != nil {
-      return err
+    log.Fatal(err)
+    return err
   }
   defer r.Body.Close()
 
@@ -55,6 +55,7 @@ func decrypt(cipher, privkey, pw string) (string, error) {
   entityList, err := openpgp.ReadArmoredKeyRing(keyringFileBuffer)
   if (err != nil){
     log.Fatal(err)
+    return "", err
   }
   entity := entityList[0]
 

data/lib/envkey/core.rb

@@ -1,28 +1,57 @@
 require 'ffi'
 require 'dotenv'
 require 'json'
+require 'set'
 
 module Envkey::Core
   extend FFI::Library
-  ffi_lib File.expand_path('../../ext/envkey.so', File.dirname(__FILE__))
-  attach_function :EnvJson, [:string], :string
-
-  def self.load_env
-    return if ENV['@@ENVKEY_LOADED_ENV']
-    Dotenv.load
-
-    if ENV["ENVKEY"]
-      json = EnvJson(ENV["ENVKEY"])
-      if json.present?
-        envs = JSON.parse(json)
-        envs.each do |k,v|
-          var = k.upcase
-          ENV[var] = v unless ENV[var]
+
+  def self.load_env spring_pre_fork_ts=nil,
+                    overload_dotenv_vars=[],
+                    overload_envkey_vars=[]
+    original_env = ENV.to_h
+    dotenv_vars = Dotenv.load
+    updated_dotenv_vars = dotenv_vars.keys.select do |k|
+      overload_dotenv_vars.include?(k) || original_env[k] == nil
+    end
+    overload_dotenv_vars.each do |k|
+      ENV[k] = dotenv_vars[k]
+    end
+
+    if (key = ENV["ENVKEY"])
+      reader, writer = IO.pipe
+
+      fork do
+        reader.close
+
+        ffi_lib File.expand_path('../../ext/envkey.so', File.dirname(__FILE__))
+        attach_function :EnvJson, [:pointer], :string
+
+        json = EnvJson(FFI::MemoryPointer.from_string(key))
+        writer.puts json
+      end
+
+      writer.close
+      while json = reader.gets
+        if json && json.gsub("\n","").gsub("\r", "") != ""
+          envs = JSON.parse(json)
+          updated_envkey_vars = []
+          envs.each do |k,v|
+            var = k.upcase
+            if !ENV[var] || overload_envkey_vars.include?(var)
+              updated_envkey_vars << var
+              ENV[var] = v
+            end
+          end
+
+          # avoid printing success message twice in quick succession when using spring
+          if !spring_pre_fork_ts || (Time.now - spring_pre_fork_ts) > 3
+            puts "ENVKEY: vars loaded and decrypted - access with ENV['YOUR_VAR_NAME']"
+          end
+          return [Set.new(updated_dotenv_vars), Set.new(updated_envkey_vars)]
+        else
+          raise "Envkey invalid. Couldn't load env."
         end
-        ENV['@@ENVKEY_LOADED_ENV'] = "true"
-        puts "ENVKEY: env loaded and decrypted - access via ENV"
-      else
-        raise "Envkey invalid. Couldn't load env."
       end
     end
   end

data/lib/envkey/rails.rb

@@ -0,0 +1,19 @@
+require "envkey/core"
+
+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)
+        end
+      rescue LoadError
+        Envkey::Core.load_env
+      end
+    end
+  end
+end

data/lib/envkey/version.rb

@@ -1,3 +1,3 @@
 module Envkey
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/lib/envkey.rb

@@ -1,12 +1,8 @@
 require "envkey/version"
 
-begin
-  require "spring/commands"
-  Spring.after_fork do
-    require "envkey/core"
-    Envkey::Core.load_env
-  end
-rescue LoadError
+if defined?(Rails)
+  require "envkey/rails"
+else
   require "envkey/core"
   Envkey::Core.load_env
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envkey
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Dane Schneider
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler