dependency.rb in teapot-1.0.0

- old
+ new

@@ -32,10 +32,11 @@
 			attr :chain
 		end
 		
 		Provision = Struct.new(:value)
 		Alias = Struct.new(:dependencies)
+		Resolution = Struct.new(:provider, :name)
 		
 		def priority= value
 			@priority = value
 		end
 		
@@ -149,11 +150,10 @@
 						explicit_providers = viable_providers if explicit_providers.empty?
 						
 						explicit_providers = filter_by_priority(explicit_providers)
 					end
 					
-
 					if explicit_providers.size == 0
 						# No provider was explicitly specified, thus we require explicit conflict resolution:
 						@conflicts[dependency] = viable_providers
 						return nil
 					elsif explicit_providers.size == 1
@@ -210,10 +210,10 @@
 					end
 
 					# puts "** Appending #{dependency} -> ordered".color(:magenta)
 					
 					# Add the provider to the ordered list.
-					@ordered << [provider, dependency]
+					@ordered << Resolution.new(provider, dependency)
 				end
 				
 				# This goes here because we want to ensure 1/ that if 
 				unless provision == nil or Alias === provision
 					# puts "** Appending #{dependency} -> provisions".color(:magenta)