lib/puppet/parser/relationship.rb in puppet-2.7.11 vs lib/puppet/parser/relationship.rb in puppet-2.7.12

@@ -1,23 +1,24 @@
 class Puppet::Parser::Relationship
   attr_accessor :source, :target, :type
 
   PARAM_MAP = {:relationship => :before, :subscription => :notify}
 
-  def evaluate(catalog)
-    if source.is_a?(Puppet::Parser::Collector)
-      sources = source.collected.values
+  def arrayify(resources)
+    case resources
+    when Puppet::Parser::Collector
+      resources.collected.values
+    when Array
+      resources
     else
-      sources = [source]
+      [resources]
     end
-    if target.is_a?(Puppet::Parser::Collector)
-      targets = target.collected.values
-    else
-      targets = [target]
-    end
-    sources.each do |s|
-      targets.each do |t|
+  end
+
+  def evaluate(catalog)
+    arrayify(source).each do |s|
+      arrayify(target).each do |t|
         mk_relationship(s, t, catalog)
       end
     end
   end
 
@@ -28,16 +29,32 @@
   def param_name
     PARAM_MAP[type] || raise(ArgumentError, "Invalid relationship type #{type}")
   end
 
   def mk_relationship(source, target, catalog)
-    unless source_resource = catalog.resource(source.to_s)
+    # REVISIT: In Ruby 1.8 we applied `to_s` to source and target, rather than
+    # `join` without an argument.  In 1.9 the behaviour of Array#to_s changed,
+    # and it gives a different representation than just concat the stringified
+    # elements.
+    #
+    # This restores the behaviour, but doesn't address the underlying question
+    # of what would happen when more than one item was passed in that array.
+    # (Hint: this will not end well.)
+    #
+    # See http://projects.puppetlabs.com/issues/12076 for the ticket tracking
+    # the fact that we should dig out the sane version of this behaviour, then
+    # implement it - where we don't risk breaking a stable release series.
+    # --daniel 2012-01-21
+    source = source.is_a?(Array) ? source.join : source.to_s
+    target = target.is_a?(Array) ? target.join : target.to_s
+
+    unless source_resource = catalog.resource(source)
       raise ArgumentError, "Could not find resource '#{source}' for relationship on '#{target}'"
     end
-    unless target_resource = catalog.resource(target.to_s)
+    unless target_resource = catalog.resource(target)
       raise ArgumentError, "Could not find resource '#{target}' for relationship from '#{source}'"
     end
-    Puppet.debug "Adding relationship from #{source.to_s} to #{target.to_s} with '#{param_name}'"
+    Puppet.debug "Adding relationship from #{source} to #{target} with '#{param_name}'"
     source_resource[param_name] ||= []
-    source_resource[param_name] << target.to_s
+    source_resource[param_name] << target
   end
 end