text-interpolator 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDk5ZDBkYjAxZTRmNjAzNmY5NjgxNDI0Njc4Y2FhYjM0YTJkZDIzNA==
+    ODdkZGQ4MzYzNThlNTM4ZjRjODA2MWRmOTM1NGQzZDEwMTQ0OTgxNg==
   data.tar.gz: !binary |-
-    NGZiNWZiNTExMjBjNWVhMGU3NTczNjYzZGMzZjk2YzgxMWQyMzMwYQ==
+    NjRiMTllODBjZWRlOTU4NjBjYWM2MWM5MWQ3NGVhZTJkNWQ5MjM1Ng==
 SHA512:
   metadata.gz: !binary |-
-    NTkyYmY5NmM0NmQ2NTQ3NDU5ZTRkZDFkOTM1ODg2MDA4MTIxNmJhNjM4NWEx
-    Njg5NWM1OWY4OTI0MzE1YTcwMTE2ZWQwMzc4NzUyOTBmNGUzZThkMjMxZjQ3
-    NzM2MGRkOTQ3YzI5YmY0NDZjNWNkYzBlZDFkODMyOGE1MDc0NzE=
+    OWMxYWM1ZTczN2ZkMjE0MTY4MDk4YzRjMjhmYjIxOTMwZTBjODZhNzZlNjYx
+    NGYwNDg2NjJmM2QwMTNlMzNjYzdiMmJmNzU4NWExZTc1NWQ4NjE3NzExYjM4
+    ZTRhZjhlZGE0ZjgwOTU0ZTE0ODAxNDdkMGIzOWIwMDcwNjU4OTE=
   data.tar.gz: !binary |-
-    ZmZkNGE5ZGU4Yjg4OWEwZmZlNTYwODg2MDUzMjQ1MzVkNGUwZDFjNTYzYWJj
-    N2Q5MGMyYWU5ZTU0YmQ5OWRhMzExODJkYjIwMzVhMjRhMGE3MDE0Y2Q2N2Yy
-    MWFkNzU3YWNiZmQ3ZmRlMjQwZWM5ZjAxNmJjZDFkN2RmY2Q3NzQ=
+    NzRkZDA1NmYzMTc0N2U4NjgyZDVmODBiNWYzYjVjZmNkMThjYmQ1MDdjMjgz
+    ZDU1MDcyZmVhN2JhMWNmYzdhMWNjMjdlMTFmZjdlNzMyYjgwZDk5YWE5NzJi
+    ZTZkZDkxMDBjYmFlNDI5MzA3MGQ2MGM5ZjViN2FlZDczMTI5MTg=

data/CHANGES

@@ -10,4 +10,8 @@
 
 == Version 1.0.2
 
+* Bug fix.
+
+== Version 1.0.3
+
 * Bug fix.

data/lib/text_interpolator/text_interpolator.rb

@@ -13,9 +13,10 @@ class TextInterpolator
   end
 
   def interpolate_string string, env={}
-    new_string = replace_special_symbols(string)
+    string = interpolate_env_vars string
+    string = string.gsub(/\#{/, '%{') if string.index(/\#\{/)
 
-    StringIO.new(new_string).read % env
+    StringIO.new(string).read % env
   end
 
   def interpolate_io io, env={}
@@ -30,32 +31,37 @@ class TextInterpolator
   end
 
   def interpolate_hash hash
+    hash.each do |key, value|
+      new_value = interpolate_env_vars value
+
+      hash[key] = new_value if new_value
+    end
+
     env = hash.reduce({}) do |result, value|
       result[value[0]] = value[1]
 
       result
     end
 
-    hash.each do |key, value|
-      new_value = replace_special_symbols(value)
+    begin
+      substitutions = false
 
-      hash[key] = StringIO.new(new_value).read % env
-    end
+      hash.each do |key, value|
+        if value.index(/\#\{/)
+          substitutions = true
+
+          value = value.gsub(/\#{/, '%{')
+
+          hash[key] = StringIO.new(value).read % env
+        end
+      end
+    end while substitutions
 
     hash
   end
 
   private
 
-  def replace_special_symbols string
-    new_string = string
-
-    new_string = new_string.gsub(/\#{/, '%{') if new_string.index(/\#\{/)
-    new_string = interpolate_env_vars(new_string) if new_string.index('ENV[')
-
-    new_string
-  end
-
   def interpolate_env_vars value
     while value.index('ENV[')
       value = interpolate_env_var value

data/lib/text_interpolator/version.rb

@@ -1,3 +1,3 @@
 class TextInterpolator
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/text_interpolator_spec.rb

@@ -60,7 +60,7 @@ describe TextInterpolator do
         '"oracle_base": "/usr/local/oracle",' +
         '"oracle_version": "11.2.0.4.0",'+
 
-        '"src_dir": "downloads",' +
+        '"src_dir": "#{user}/downloads",' +
         '"dest_dir": "#{oracle_base}/instantclient_11_2",' +
 
         '"basic_zip": "#{src_dir}/instantclient-basic-macos.x64-#{oracle_version}.zip"' +
@@ -73,7 +73,7 @@ describe TextInterpolator do
       expect(result[:user]).to eq ENV['USER']
       expect(result[:oracle_base]).to eq '/usr/local/oracle'
       expect(result[:dest_dir]).to eq '/usr/local/oracle/instantclient_11_2'
-      expect(result[:basic_zip]).to eq 'downloads/instantclient-basic-macos.x64-11.2.0.4.0.zip'
+      expect(result[:basic_zip]).to eq ENV['USER'] + '/downloads/instantclient-basic-macos.x64-11.2.0.4.0.zip'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: text-interpolator
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Alexander Shvets