From e1b3ab5af290f6d2eeb56c4b72e341324414a6d2 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Wed, 14 Sep 2016 22:32:11 +0200 Subject: Verify expandability of variables defined as part of environment --- lib/expand_variables.rb | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'lib/expand_variables.rb') diff --git a/lib/expand_variables.rb b/lib/expand_variables.rb index 40bf9483eb5..669735cc56c 100644 --- a/lib/expand_variables.rb +++ b/lib/expand_variables.rb @@ -1,15 +1,17 @@ -String.instance_eval - def expand_variables(variables) - # Convert hash array to variables - if variables.is_a?(Array) - variables = variables.reduce({}) do |hash, variable| - hash[variable[:key]] = variable[:value] - hash +module ExpandVariables + class << self + def expand_variables(value, variables) + # Convert hash array to variables + if variables.is_a?(Array) + variables = variables.reduce({}) do |hash, variable| + hash[variable[:key]] = variable[:value] + hash + end end - end - self.gsub(/\$([a-zA-Z_][a-zA-Z0-9_]*)|\${\g<1>}|%\g<1>%/) do - variables[$1 || $2] + value.gsub(/\$([a-zA-Z_][a-zA-Z0-9_]*)|\${\g<1>}|%\g<1>%/) do + variables[$1 || $2] + end end end end -- cgit v1.2.1