secret_env 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7323742d6e6c066b4c0239a3149a548498d82fa1
-  data.tar.gz: 418b98c1383ebd67311dafe21232fe7e4069f6e5
+  metadata.gz: a02b5d85e950560098176589728877803dd512e2
+  data.tar.gz: 896fe3bc426152e9d93299bf6c8991ab86a6ceb7
 SHA512:
-  metadata.gz: b6c9cc0d8615845abcfef44eb754e50d086b84d1a8f80d91a75e563af0e58f2ec9ab2baa598ab149e3e29a7b2d2c06764d199d0ce4aefb9ae9386529d018cb11
-  data.tar.gz: ebb1ab0278300772720a5a9ec1538bbb316676971e6049d469dddbccaee8faea109e8467a500cc8055d5f50275291002d64d613ffee61f4d9f760648413d8221
+  metadata.gz: b457194a957371ae0de8e5b330543cdde6489037b5ff346516efe0582d5597ca68ba4076b121b07ea66b44d2e32d7b6493456fd5b6a00c52a353f2c5cda064ef
+  data.tar.gz: 76034dc4e5f49c1d9b6b1dd9914e8faa134773eb22a07be9aeb949db182797ab805743f70a2e75bb57ed6871efef617c93fd650b02de7da53d722516229858df

data/lib/secret_env/version.rb

@@ -1,3 +1,3 @@
 module SecretEnv
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/secret_env.rb

@@ -10,19 +10,27 @@ module SecretEnv
 
     storage = Storage.setup(config['storage'])
 
+    env_map = {}
     Array(config.fetch('env')).each do |key, raw_value|
-      record = Record.new(key: key, raw_value: raw_value, storage: storage)
-      ENV[record.key] = record.value
+      record = Record.new(key: key, raw_value: raw_value, storage: storage, dependency: env_map)
+      env_map[record.key] = record
+    end
+
+    env_map.each do |key, record|
+      unless ENV.has_key?(record.key)
+        ENV[record.key] = record.value
+      end
     end
   end
 
   class Record
     attr_reader :key
 
-    def initialize(key:, raw_value:, storage: Storage::Plain.new)
+    def initialize(key:, raw_value:, storage: Storage::Plain.new, dependency: {})
       @key = key
       @raw_value = raw_value
       @storage = storage
+      @dependency = dependency
     end
 
     def value
@@ -30,13 +38,27 @@ module SecretEnv
       parts = []
       while part = scanner.scan_until(/#\{(.*?)\}/)
         secret_key = scanner.matched[2..-2] # Extract "secret" from "\#{secret}"
-        secret = @storage.retrieve(secret_key)
+
+
+        secret = case
+                 when ENV.has_key?(secret_key)
+                   ENV[secret_key]
+                 when @dependency.has_key?(secret_key)
+                   # FIXME this code may cause infinite loop
+                   @dependency[secret_key].value
+                 else
+                   @storage.retrieve(secret_key)
+                 end
+
+        raise SecretEnv::KeyNotFound unless secret
         parts << part.gsub(scanner.matched, secret)
       end
       parts << scanner.rest
       parts.join
     end
   end
+
+  class KeyNotFound < StandardError; end
 end
 
 require 'secret_env/rails' if defined?(Rails)

data/secret_env.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rcredstash"
+  spec.add_development_dependency "rcredstash", ">= 0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: secret_env
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - adorechic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 description: SecretEnv retrieves secrets and export to ENV
 email:
 - adorechic@gmail.com
@@ -114,4 +114,3 @@ signing_key:
 specification_version: 4
 summary: SecretEnv retrieves secrets and export to ENV
 test_files: []
-has_rdoc: