text-interpolator 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGIxNTMzNDU2ODc3YmM2NDAzMmIyY2UzMzhmOWZjMDY5MjczNGQzZQ==
+    NDk5ZDBkYjAxZTRmNjAzNmY5NjgxNDI0Njc4Y2FhYjM0YTJkZDIzNA==
   data.tar.gz: !binary |-
-    ZDJhZmQwMjZmMjEwMjExMWQ4YTY1MDI3NTc3ZmFjNzU4MzgxYzc5OA==
+    NGZiNWZiNTExMjBjNWVhMGU3NTczNjYzZGMzZjk2YzgxMWQyMzMwYQ==
 SHA512:
   metadata.gz: !binary |-
-    NmE4YmYxN2JhNTYwMTBiYmFmZmM0MmY4ZDM2YTFhN2U2NjdlMDZjMjUyYjRh
-    YTkzMGZmYjg3Njk2M2NhODM0M2Q1NzBmY2NmMTgyYmJhZjEzMTEyMTVmYTA3
-    ODBmMWY0N2UyZTgyZDM5N2E0ZDhhZmE4YTQ0OGRlZjczOWZmNDQ=
+    NTkyYmY5NmM0NmQ2NTQ3NDU5ZTRkZDFkOTM1ODg2MDA4MTIxNmJhNjM4NWEx
+    Njg5NWM1OWY4OTI0MzE1YTcwMTE2ZWQwMzc4NzUyOTBmNGUzZThkMjMxZjQ3
+    NzM2MGRkOTQ3YzI5YmY0NDZjNWNkYzBlZDFkODMyOGE1MDc0NzE=
   data.tar.gz: !binary |-
-    NThjZDg0MTI4NDU2YmNhMDQ2NGQzNWE2MDI1ZDhmMWE0M2NhZWIyNDgwNDUx
-    NzVmNTQzNGJlZGU4MjE2MGE2OTMzNWViMTgxM2NiNjhlOTAzODUzZjc5YzNm
-    ZDAyM2ZlYjgyNTg3MGVjOWE1Y2Y2YjFiNWVmNTI3NTQ4MjQ0Mzk=
+    ZmZkNGE5ZGU4Yjg4OWEwZmZlNTYwODg2MDUzMjQ1MzVkNGUwZDFjNTYzYWJj
+    N2Q5MGMyYWU5ZTU0YmQ5OWRhMzExODJkYjIwMzVhMjRhMGE3MDE0Y2Q2N2Yy
+    MWFkNzU3YWNiZmQ3ZmRlMjQwZWM5ZjAxNmJjZDFkN2RmY2Q3NzQ=

data/CHANGES

@@ -7,3 +7,7 @@
 == Version 1.0.1
 
 * Bug fix.
+
+== Version 1.0.2
+
+* Bug fix.

data/lib/text_interpolator/text_interpolator.rb

@@ -13,11 +13,9 @@ class TextInterpolator
   end
 
   def interpolate_string string, env={}
-    string = string.gsub(/\#{/, '%{') if string.index(/\#\{/)
+    new_string = replace_special_symbols(string)
 
-    string = interpolate_env_vars(string) if string.index('ENV[')
-
-    StringIO.new(string).read % env
+    StringIO.new(new_string).read % env
   end
 
   def interpolate_io io, env={}
@@ -32,22 +30,16 @@ class TextInterpolator
   end
 
   def interpolate_hash hash
-    pairs = hash.reduce({}) do |result, value|
+    env = hash.reduce({}) do |result, value|
       result[value[0]] = value[1]
 
       result
     end
 
     hash.each do |key, value|
-      value = value.gsub(/\#/, '%') if value.index("#")
-
-      hash[key] = StringIO.new(value).read % pairs
-    end
-
-    hash.each do |key, value|
-      new_value = interpolate_env_vars value
+      new_value = replace_special_symbols(value)
 
-      hash[key] = new_value if new_value
+      hash[key] = StringIO.new(new_value).read % env
     end
 
     hash
@@ -55,6 +47,15 @@ class TextInterpolator
 
   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.1"
+  VERSION = "1.0.2"
 end

data/spec/text_interpolator_spec.rb

@@ -75,15 +75,5 @@ describe TextInterpolator do
       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'
     end
-
-    it "test" do
-      env = {:host=>"localhost", :user=>"ashvets", :home=>"/Users/ashvets", :ruby_home=>"/Users/ashvets/.rvm/rubies/ruby-1.9.3-p545", :oracle_base=>"/usr/local/oracle", :oracle_version=>"11.2.0.4.0", :ruby_oci_version=>"2.1.7", :tns_admin_dir=>"/usr/local/oracle/network/admin", :src_dir=>"downloads", :dest_dir=>"/usr/local/oracle/instantclient_11_2", :basic_zip=>"downloads/instantclient-basic-macos.x64-11.2.0.4.0.zip", :sdk_zip=>"downloads/instantclient-sdk-macos.x64-11.2.0.4.0.zip", :sqlplus_zip=>"downloads/instantclient-sqlplus-macos.x64-11.2.0.4.0.zip"}
-
-      s = "\necho \"Installing ruby-oci8 gem...\"\n\nORACLE_BASE=\"%{oracle_base}\"\nDYLD_LIBRARY_PATH=\"%{dest_dir}\"\nTNS_ADMIN=\"%{tns_admin_dir}\"\nNLS_LANG='.UTF8'\n\nENV_VARS=\"ORACLE_BASE=$ORACLE_BASE DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH TNS_ADMIN=$TNS_ADMIN NLS_LANG=$NLS_LANG\"\n\n%env $ENV_VARS bash -c 'gem install ruby-oci8 -v %{ruby_oci_version}'\n\n\n"
-
-      result = subject.interpolate s, env
-
-      p result
-    end
   end
 end

metadata

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