summaryrefslogtreecommitdiff
path: root/lib/expand_variables.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/expand_variables.rb')
-rw-r--r--lib/expand_variables.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/expand_variables.rb b/lib/expand_variables.rb
index c83cec9dc4a..ff97a02ebde 100644
--- a/lib/expand_variables.rb
+++ b/lib/expand_variables.rb
@@ -5,10 +5,9 @@ module ExpandVariables
def expand(value, variables)
# Convert hash array to variables
if variables.is_a?(Array)
- variables = variables.reduce({}) do |hash, variable|
+ variables = variables.each_with_object({}) { |variable, hash|
hash[variable[:key]] = variable[:value]
- hash
- end
+ }
end
value.gsub(/\$([a-zA-Z_][a-zA-Z0-9_]*)|\${\g<1>}|%\g<1>%/) do