lachlan-sprinkle 0.0.7 → 0.0.8

data/lib/sprinkle/package.rb

@@ -93,22 +93,27 @@ module Sprinkle
   #++
   module Package
     PACKAGES = {}
+    VIRTUAL_PACKAGES = []
 
     def package(name, metadata = {}, &block)
       package = Package.new(name, metadata, &block)
       (PACKAGES[name] ||= []) << package
-      (PACKAGES[package.provides] ||= []) << package if package.provides
+      if package.provides
+        (PACKAGES[package.provides] ||= []) << package
+        VIRTUAL_PACKAGES << package.provides
+      end
       package
     end
     
     def find(name)
       packages = PACKAGES[name]
-      if packages and packages.length > 1
+      if packages and packages.length > 1 and VIRTUAL_PACKAGES.include? name
         selected = []
         choose do |menu|
-          menu.header = "\nMultiple choices exist for package #{name}"
+          menu.layout = :one_line
+          menu.header = "Choose #{name}"
           packages.sort!.each do |package|
-            menu.choice("#{package.name}#{' (' + package.version + ')' if package.version}") do
+            menu.choice(package.to_s) do
               selected << package
             end
           end
@@ -283,9 +288,9 @@ module Sprinkle
 
       private
 
-        def meta_package?
-          @installer == nil
-        end
+      def meta_package?
+        @installer == nil
+      end
     end
   end
 end

data/lib/sprinkle/policy.rb

@@ -102,7 +102,7 @@ module Sprinkle
 
         def normalize(all, &block)
           all = all.flatten.uniq
-          cloud_info "\n--> Normalized installation order for all packages: #{all.map(&:to_s).join(', ')}"
+          cloud_info "\nNormalized installation order for all packages: #{all.map(&:to_s).join(', ')}"
           all.each &block
         end
     end

data/lib/sprinkle/version.rb

@@ -2,7 +2,7 @@ module Sprinkle #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 7
+    TINY  = 8
 
     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.7"
+  s.version = "0.0.8"
 
   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.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Marcus Crafter