crafterm-sprinkle 0.1.0 → 0.1.1

data/README.txt

@@ -167,7 +167,7 @@ An full example Sprinkle deployment script for deploying Rails (via gems), MySQL
 
     # Deployment
 
-    # Configures spinkle to use capistrano for delivery of commands to the remote machines (via
+    # Configures sprinkle to use capistrano for delivery of commands to the remote machines (via
     # the named 'deploy' recipe). Also configures 'source' installer defaults to put package gear
     # in /usr/local
 

data/lib/sprinkle/installers/source.rb

@@ -52,7 +52,7 @@ module Sprinkle
         def configure_commands
           return [] if custom_install?
 
-          command = "bash -c 'cd #{build_dir} && ./configure --silent --prefix #{@options[:prefix]} "
+          command = "bash -c 'cd #{build_dir} && ./configure --prefix=#{@options[:prefix]} "
 
           extras = {
             :enable  => '--enable', :disable => '--disable',

data/lib/sprinkle/package.rb

@@ -1,22 +1,22 @@
 module Sprinkle
   module Package
     PACKAGES = {}
-  
+
     def package(name, metadata = {}, &block)
       package = Package.new(name, metadata, &block)
       PACKAGES[name] = package
-    
+
       if package.provides
         (PACKAGES[package.provides] ||= []) << package
       end
-      
+
       package
     end
-    
+
     class Package
       include ArbitraryOptions
       attr_accessor :name, :provides, :installer, :dependencies
-    
+
       def initialize(name, metadata = {}, &block)
         raise 'No package name supplied' unless name
 
@@ -25,49 +25,49 @@ module Sprinkle
         @dependencies = []
         self.instance_eval &block
       end
-    
+
       def apt(*names)
         @installer = Sprinkle::Installers::Apt.new(self, *names)
       end
-    
-      def gem(name)
+
+      def gem(name, options = {}, &block)
         @dependencies << :rubygems
-        @installer = Sprinkle::Installers::Gem.new(self, name)
+        @installer = Sprinkle::Installers::Gem.new(self, name, options, &block)
       end
-    
-      def source(source, &block)
+
+      def source(source, options = {}, &block)
         @dependencies << :build_essential # REVISIT: should only be for Ubuntu/Debian, need platform specific bits here
-        @installer = Sprinkle::Installers::Source.new(self, source, &block)
+        @installer = Sprinkle::Installers::Source.new(self, source, options, &block)
       end
-    
+
       def process(deployment, roles)
         return if meta_package?
 
         @installer.defaults(deployment)
         @installer.process(roles)
       end
-    
+
       def requires(*packages)
         @dependencies << packages
         @dependencies.flatten!
       end
-    
+
       def tree(depth = 1, &block)
         packages = []
-      
+
         @dependencies.each do |dep|
           package = PACKAGES[dep]
           block.call(self, package, depth) if block
           packages << package.tree(depth + 1, &block)
         end
-      
+
         packages << self
       end
-    
+
       def to_s; @name; end
-      
+
       private
-      
+
         def meta_package?
           @installer == nil
         end

data/lib/sprinkle/policy.rb

@@ -38,6 +38,7 @@ module Sprinkle
           cloud_info "\nPolicy #{@name} requires package #{p}"
 
           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|

data/lib/sprinkle/version.rb

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

data/spec/sprinkle/installers/source_spec.rb

@@ -140,7 +140,7 @@ describe Sprinkle::Installers::Source do
 
       @installer.should_receive(:build).and_return(
         [
-         "bash -c 'cd /usr/local/builds && ./configure --silent --prefix /usr/local #{options} > #{@package.name}-configure.log 2>&1'"
+         "bash -c 'cd /usr/local/builds && ./configure --prefix=/usr/local #{options} > #{@package.name}-configure.log 2>&1'"
         ]
       )
     end

data/spec/sprinkle/policy_spec.rb

@@ -108,3 +108,19 @@ describe Sprinkle::Policy do
     end
   end
 end
+
+describe Sprinkle::Policy, 'with missing packages' do
+
+  before do
+    @deployment = mock(Sprinkle::Deployment)
+    Sprinkle::Package::PACKAGES.clear # reset full package list before each spec is run
+
+    @policy = policy :test, :roles => :app do; requires :z; end
+    $terminal.stub!(:choose).and_return(:c) # stub out highline asking questions
+  end
+
+  it 'should raise an error if a package is missing' do
+    lambda { @policy.process(@deployment) }.should raise_error
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: crafterm-sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Marcus Crafter