lachlan-sprinkle 0.0.6 → 0.0.7

data/lib/sprinkle/package.rb

@@ -96,17 +96,34 @@ module Sprinkle
 
     def package(name, metadata = {}, &block)
       package = Package.new(name, metadata, &block)
-      PACKAGES[name] = package
-
-      if package.provides
-        (PACKAGES[package.provides] ||= []) << package
-      end
-
+      (PACKAGES[name] ||= []) << package
+      (PACKAGES[package.provides] ||= []) << package if package.provides
       package
     end
+    
+    def find(name)
+      packages = PACKAGES[name]
+      if packages and packages.length > 1
+        selected = []
+        choose do |menu|
+          menu.header = "\nMultiple choices exist for package #{name}"
+          packages.sort!.each do |package|
+            menu.choice("#{package.name}#{' (' + package.version + ')' if package.version}") do
+              selected << package
+            end
+          end
+          menu.choice("all") do
+            selected = packages
+          end
+        end
+        packages = selected
+      end
+      packages
+    end
 
     class Package #:nodoc:
       include ArbitraryOptions
+      include Comparable
       attr_accessor :name, :provides, :installer, :dependencies, :recommends, :verifications
 
       def initialize(name, metadata = {}, &block)
@@ -185,7 +202,7 @@ module Sprinkle
       def process(deployment, roles)
         return if meta_package?
 
-        logger.info "\n#{self.name}"
+        logger.info "\n#{self.to_s}"
         # Run a pre-test to see if the software is already installed. If so,
         # we can skip it, unless we have the force option turned on!
         unless @verifications.empty? || Sprinkle::OPTIONS[:force]
@@ -233,45 +250,39 @@ module Sprinkle
       def tree(depth = 1, &block)
         packages = []
 
-        @recommends.each do |dep|
-          package = PACKAGES[dep]
-          next unless package # skip missing recommended packages as they can be optional
-          block.call(self, package, depth) if block
-          packages << package.tree(depth + 1, &block)
+        @recommends.each do |name|
+          list = find(name)
+          next unless list # skip missing recommended packages as they can be optional
+          list.each { |package| 
+            block.call(self, package, depth) if block
+            packages << package.tree(depth + 1, &block)
+          }
         end
 
-        @dependencies.each do |dep|
-          package = PACKAGES[dep]
-          package = select_package(dep, package) if package.is_a? Array
-          
-          raise "Package definition not found for key: #{dep}" unless package
-          block.call(self, package, depth) if block
-          packages << package.tree(depth + 1, &block)
+        @dependencies.each do |name|
+          list = find(name)
+          raise "Package definition not found: #{name}" unless list
+          list.each { |package|
+            block.call(self, package, depth) if block
+            packages << package.tree(depth + 1, &block)
+          }
         end
 
         packages << self
       end
 
-      def to_s; @name; end
+      def to_s
+        s = @name.to_s
+        s << " (#{@version.to_s})" if @version
+        s
+      end
+      
+      def <=>(other)
+        self.to_s <=> other.to_s
+      end
 
       private
 
-        def select_package(name, packages)
-          if packages.size <= 1
-            package = packages.first
-          else
-            package = choose do |menu|
-              menu.prompt = "Multiple choices exist for virtual package #{name}"
-              menu.choices *packages.collect(&:to_s)
-            end
-            package = Sprinkle::Package::PACKAGES[package]
-          end
-
-          cloud_info "Selecting #{package.to_s} for virtual package #{name}"
-
-          package
-        end
-
         def meta_package?
           @installer == nil
         end

data/lib/sprinkle/policy.rb

@@ -76,16 +76,17 @@ module Sprinkle
 
         @packages.each do |p|
           cloud_info "\nPolicy #{@name} requires package #{p}"
+          
+          list = Sprinkle::Package.find(p)
+          raise "Package definition not found: #{p}" unless list
 
-          package = Sprinkle::Package::PACKAGES[p]
-          raise "Package definition not found for key: #{p}" unless package
-          package = select_package(p, package) if package.is_a? Array # handle virtual package selection
-
-          tree = package.tree do |parent, child, depth|
-            indent = "\t" * depth; cloud_info "#{indent}Package #{parent.name} requires #{child.name}"
-          end
+          list.each { |package|
+            tree = package.tree do |parent, child, depth|
+              indent = "\t" * depth; cloud_info "#{indent}Package #{parent.to_s} requires #{child.to_s}"
+            end
 
-          all << tree
+            all << tree
+          }
         end
 
         normalize(all) do |package|
@@ -99,25 +100,9 @@ module Sprinkle
           logger.info(message) if Sprinkle::OPTIONS[:cloud] or logger.debug?
         end
 
-        def select_package(name, packages)
-          if packages.size <= 1
-            package = packages.first
-          else
-            package = choose do |menu|
-              menu.prompt = "Multiple choices exist for virtual package #{name}"
-              menu.choices *packages.collect(&:to_s)
-            end
-            package = Sprinkle::Package::PACKAGES[package]
-          end
-
-          cloud_info "Selecting #{package.to_s} for virtual package #{name}"
-
-          package
-        end
-
         def normalize(all, &block)
           all = all.flatten.uniq
-          cloud_info "\n--> Normalized installation order for all packages: #{all.collect(&:name).join(', ')}"
+          cloud_info "\n--> Normalized installation order for all packages: #{all.map(&:to_s).join(', ')}"
           all.each &block
         end
     end

data/lib/sprinkle/verify.rb

@@ -101,7 +101,7 @@ module Sprinkle
     attr_accessor :package, :commands
     
     def initialize(package, commands)
-      super("Verifying #{package.name} failed: #{commands.join(RUBY_PLATFORM =~ /win32/ ? ' & ' : '; ')}")
+      super("Verifying #{package.name} failed: #{Array(commands).join(RUBY_PLATFORM =~ /win32/ ? ' & ' : '; ')}")
       
       @package = package
       @commands = commands

data/lib/sprinkle/version.rb

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

data/spec/sprinkle/verify_spec.rb

@@ -140,7 +140,7 @@ describe Sprinkle::Verify do
       end
 
       it 'should print the install sequence to the console' do
-        @verification.should_receive(:logger).twice.and_return(@logger)
+        @verification.should_receive(:logger).once.and_return(@logger)
       end
       
       after do

data/sprinkle.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{sprinkle}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcus Crafter", "Mitchell Hashimoto"]
-  s.date = %q{2009-03-29}
+  s.date = %q{2009-03-30}
   s.default_executable = %q{sprinkle}
   s.description = %q{Ruby DSL based software provisioning tool}
   s.email = ["crafterm@redartisan.com", "mitchell.hashimoto@citrusbyte.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lachlan-sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-03-30 00:00:00 -07:00
 default_executable: sprinkle
 dependencies: 
 - !ruby/object:Gem::Dependency