X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7b9ec4b60ee39614d1d083d7220e76b07d2b275f..6eb58868965ccd3debcb273e268d6e77948fe6c3:/cookbooks/munin/libraries/expand.rb?ds=inline diff --git a/cookbooks/munin/libraries/expand.rb b/cookbooks/munin/libraries/expand.rb index 9269761f9..248c5ad5f 100644 --- a/cookbooks/munin/libraries/expand.rb +++ b/cookbooks/munin/libraries/expand.rb @@ -1,13 +1,17 @@ class Chef class Munin - def self.expand(template, nodes) - nodes.map do |node| - if node.kind_of?(Hash) - template.gsub(/%%([^%]+)%%/) { node[$1.to_sym] } + def self.expand(template, nodes, separator = " ") + nodes.map do |node| + if node.is_a?(Hash) + template + .gsub(/%%%([^%]+)%%%/) { node[Regexp.last_match[1].to_sym].tr("-", "_") } + .gsub(/%%([^%]+)%%/) { node[Regexp.last_match[1].to_sym] } else - template.gsub("%%", node) + template + .gsub("%%%", node.tr("-", "_")) + .gsub("%%", node) end - end.join(" ") + end.join(separator) end - end + end end