crafterm-sprinkle 0.2.1 → 0.2.2

data/Manifest.txt

@@ -42,18 +42,19 @@ lib/sprinkle/extensions/dsl_accessor.rb
 lib/sprinkle/extensions/string.rb
 lib/sprinkle/extensions/symbol.rb
 lib/sprinkle/installers/apt.rb
+lib/sprinkle/installers/bsd_port.rb
 lib/sprinkle/installers/deb.rb
+lib/sprinkle/installers/freebsd_pkg.rb
 lib/sprinkle/installers/gem.rb
 lib/sprinkle/installers/installer.rb
+lib/sprinkle/installers/mac_port.rb
+lib/sprinkle/installers/openbsd_pkg.rb
+lib/sprinkle/installers/opensolaris_pkg.rb
+lib/sprinkle/installers/push_text.rb
 lib/sprinkle/installers/rake.rb
 lib/sprinkle/installers/rpm.rb
 lib/sprinkle/installers/source.rb
 lib/sprinkle/installers/yum.rb
-lib/sprinkle/installers/freebsd_pkg.rb
-lib/sprinkle/installers/openbsd_pkg.rb
-lib/sprinkle/installers/opensolaris_pkg.rb
-lib/sprinkle/installers/bsd_port.rb
-lib/sprinkle/installers/mac_port.rb
 lib/sprinkle/package.rb
 lib/sprinkle/policy.rb
 lib/sprinkle/script.rb
@@ -76,15 +77,18 @@ spec/sprinkle/deployment_spec.rb
 spec/sprinkle/extensions/array_spec.rb
 spec/sprinkle/extensions/string_spec.rb
 spec/sprinkle/installers/apt_spec.rb
+spec/sprinkle/installers/bsd_port_spec.rb
+spec/sprinkle/installers/freebsd_pkg_spec.rb
 spec/sprinkle/installers/gem_spec.rb
 spec/sprinkle/installers/installer_spec.rb
+spec/sprinkle/installers/mac_port_spec.rb
+spec/sprinkle/installers/openbsd_pkg_spec.rb
+spec/sprinkle/installers/opensolaris_pkg_spec.rb
+spec/sprinkle/installers/push_text_spec.rb
+spec/sprinkle/installers/rake_spec.rb
 spec/sprinkle/installers/rpm_spec.rb
-spec/sprinkle/installers/yum_spec.rb
 spec/sprinkle/installers/source_spec.rb
-spec/sprinkle/installers/openbsd_pkg_spec.rb
-spec/sprinkle/installers/freebsd_pkg_spec.rb
-spec/sprinkle/installers/bsd_port_spec.rb
-spec/sprinkle/installers/mac_port_spec.rb
+spec/sprinkle/installers/yum_spec.rb
 spec/sprinkle/package_spec.rb
 spec/sprinkle/policy_spec.rb
 spec/sprinkle/script_spec.rb

data/lib/sprinkle/package.rb

@@ -237,6 +237,8 @@ module Sprinkle
 
         @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)
@@ -249,6 +251,22 @@ module Sprinkle
 
       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/version.rb

@@ -2,7 +2,7 @@ module Sprinkle #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
 
     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.2.1"
+  s.version = "0.2.2"
 
   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: crafterm-sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Marcus Crafter