secret_env 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b7fd45045664cce3ef970f014b7b6e9e69bb1d3
-  data.tar.gz: f5b28f4de7822f8906eaef22620924003fb9b508
+  metadata.gz: b1e1505edb2746b3c514bcfc4d63a55932bac752
+  data.tar.gz: 8caaa36d3a22b33d9d7765298239da62df506724
 SHA512:
-  metadata.gz: 4a48dad04748521ae7a1fd9dd3b6f051b12f88c7304ba6c7f94d4f9149bb413e982332448639dd1e71954ad131381e16a7c0b8e8ba93af73bf8c32c0e352d6f2
-  data.tar.gz: e774b89c3334d001aa32830dbf5d5195874569511d44af88882b2f83108d2c087490f5c492e319531518546288522a110fe8758ffc5f7029fd1ae299a852cab6
+  metadata.gz: f7875732f6642c3da35395258b837ff955368002094eefce272ce3acd06b945bb47689ec661604e4962aa4551333dd8f68406e17eb833f551ee9ebab81d43fad
+  data.tar.gz: 7b99d06bea62e93ba190d134c0fedfd86ffebdf9c0930dc0b683e1090c4b2f7d17e1c4e27f8373ec979272ccef38d60198d5cd36cf562e81f68685da813fe988

data/lib/secret_env/version.rb

@@ -1,3 +1,3 @@
 module SecretEnv
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/lib/secret_env.rb

@@ -37,20 +37,24 @@ module SecretEnv
       scanner = StringScanner.new(@raw_value)
       parts = []
       while part = scanner.scan_until(/#\{(.*?)\}/)
-        secret_key = scanner.matched[2..-2] # Extract "secret" from "\#{secret}"
+        secret_keys = scanner.matched[2..-2] # Extract "secret" from "\#{secret}"
 
+        secret = nil
+        secret_keys.split("||").map(&:strip).each do |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
 
-        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
+          break if secret
+        end
 
-        raise SecretEnv::KeyNotFound, secret_key unless secret
+        raise SecretEnv::KeyNotFound, secret_keys unless secret
         parts << part.gsub(scanner.matched, secret)
       end
       parts << scanner.rest

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: secret_env
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - adorechic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: SecretEnv retrieves secrets and export to ENV