lachlan-sprinkle 0.0.15 → 0.0.16

data/lib/sprinkle/package.rb

@@ -93,18 +93,29 @@ module Sprinkle
   #++
   module Package
     PACKAGES = {}
-    VIRTUAL_PACKAGES = []
+    
+    # Keep a list of all the virtual packages defined, so if multiple packages are 
+    # defined that provide this virtual package we can ask the user which they would 
+    # like to install.
+    VIRTUAL_PACKAGES = [] 
 
     def package(name, metadata = {}, &block)
       package = Package.new(name, metadata, &block)
+      # there might be multiple versions of a package so append to the list
       (PACKAGES[name] ||= []) << package
       if package.provides
+        # there might be multiple providers so append to provider list and remember
+        # that this packages is virtual
         (PACKAGES[package.provides] ||= []) << package
         VIRTUAL_PACKAGES << package.provides
       end
       package
     end
     
+    # Returns a list of packages with the given name.  If multiple packages were
+    # defined with the same name (ie. different versions of the same software) then
+    # all versions are returned.  If the given name identifies a virtual package then
+    # and there are multiple providers, then prompt the user to choose which to install.
     def find(name)
       packages = PACKAGES[name]
       if packages and packages.length > 1 and VIRTUAL_PACKAGES.include? name
@@ -290,13 +301,15 @@ module Sprinkle
 
         packages << self
 
-        @optional.each do |dep|
-          package = PACKAGES[dep]
-          next unless package # skip missing optional packages as they're allow to not exist
-          block.call(self, package, depth) if block
-          packages << package.tree(depth + 1, &block)
+        @optional.each do |name|
+          list = find(name)
+          next unless list # skip missing optional packages as they're allowed to not exist
+          list.each { |package|
+            block.call(self, package, depth) if block 
+            packages << package.tree(depth + 1, &block)            
+          }
         end
-
+        
         packages
       end
 

data/lib/sprinkle/version.rb

@@ -2,7 +2,7 @@ module Sprinkle #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 15
+    TINY  = 16
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/sprinkle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{sprinkle}
-  s.version = "0.0.15"
+  s.version = "0.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcus Crafter", "Mitchell Hashimoto"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lachlan-sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors: 
 - Marcus Crafter