sprinkle 0.1.6 → 0.1.7

data/CREDITS

@@ -3,15 +3,17 @@
 Many thanks to the following people who have submitted ideas, patches, helped with testing
 and/or generally provided support to Sprinke, I really appreciate your help:
 
-Kristin Baumann    (http://crafterm.net/kristin/blog/)
-Ben Schwarz        (http://germanforblack.com/)
-Jim Freeze         (http://www.artima.com/rubycs/articles/ruby_as_dslP.html)
-Matthew Tanase     (http://www.slicehost.com)
-Jared Kuolt        (http://www.slicehost.com)
-Jamis Buck         (http://www.capify.org)
-Matt Allen         (http://blog.allen.com.au)
-Eric Hodel         (http://blog.segment7.net)
-Pete Yandell       (http://notahat.com)
-Adam Meehan        (http://duckpunching.com)
-Mitchell Hashimoto (http://mitchellhashimoto.com)
-Ari Lerner         (http://www.citrusbyte.com)
+Kristin Baumann        (http://crafterm.net/kristin/blog/)
+Ben Schwarz            (http://germanforblack.com/)
+Jim Freeze             (http://www.artima.com/rubycs/articles/ruby_as_dslP.html)
+Matthew Tanase         (http://www.slicehost.com)
+Jared Kuolt            (http://www.slicehost.com)
+Jamis Buck             (http://www.capify.org)
+Matt Allen             (http://blog.allen.com.au)
+Eric Hodel             (http://blog.segment7.net)
+Pete Yandell           (http://notahat.com)
+Adam Meehan            (http://duckpunching.com)
+Mitchell Hashimoto     (http://mitchellhashimoto.com)
+Ari Lerner             (http://www.citrusbyte.com)
+Jorgen Orehøj Erichsen (http://blog.erichsen.net)
+Joshua Sierles         (http://diluvia.net)

data/Manifest.txt

@@ -7,11 +7,22 @@ Rakefile
 bin/sprinkle
 config/hoe.rb
 config/requirements.rb
+examples/packages/build_essential.rb
+examples/packages/databases/mysql.rb
+examples/packages/databases/sqlite3.rb
+examples/packages/phusion.rb
+examples/packages/ruby/rails.rb
+examples/packages/ruby/ruby.rb
+examples/packages/ruby/rubygems.rb
+examples/packages/scm/git.rb
+examples/packages/scm/subversion.rb
+examples/packages/servers/apache.rb
 examples/rails/README
 examples/rails/deploy.rb
 examples/rails/packages/database.rb
 examples/rails/packages/essential.rb
 examples/rails/packages/rails.rb
+examples/rails/packages/scm.rb
 examples/rails/packages/search.rb
 examples/rails/packages/server.rb
 examples/rails/rails.rb
@@ -19,6 +30,8 @@ examples/sprinkle/sprinkle.rb
 lib/sprinkle.rb
 lib/sprinkle/actors/actors.rb
 lib/sprinkle/actors/capistrano.rb
+lib/sprinkle/actors/local.rb
+lib/sprinkle/actors/ssh.rb
 lib/sprinkle/actors/vlad.rb
 lib/sprinkle/configurable.rb
 lib/sprinkle/deployment.rb
@@ -29,11 +42,13 @@ lib/sprinkle/extensions/dsl_accessor.rb
 lib/sprinkle/extensions/string.rb
 lib/sprinkle/extensions/symbol.rb
 lib/sprinkle/installers/apt.rb
+lib/sprinkle/installers/deb.rb
 lib/sprinkle/installers/gem.rb
 lib/sprinkle/installers/installer.rb
 lib/sprinkle/installers/rake.rb
 lib/sprinkle/installers/rpm.rb
 lib/sprinkle/installers/source.rb
+lib/sprinkle/installers/yum.rb
 lib/sprinkle/package.rb
 lib/sprinkle/policy.rb
 lib/sprinkle/script.rb
@@ -50,6 +65,8 @@ script/generate
 spec/spec.opts
 spec/spec_helper.rb
 spec/sprinkle/actors/capistrano_spec.rb
+spec/sprinkle/actors/local_spec.rb
+spec/sprinkle/configurable_spec.rb
 spec/sprinkle/deployment_spec.rb
 spec/sprinkle/extensions/array_spec.rb
 spec/sprinkle/extensions/string_spec.rb
@@ -57,6 +74,7 @@ spec/sprinkle/installers/apt_spec.rb
 spec/sprinkle/installers/gem_spec.rb
 spec/sprinkle/installers/installer_spec.rb
 spec/sprinkle/installers/rpm_spec.rb
+spec/sprinkle/installers/yum_spec.rb
 spec/sprinkle/installers/source_spec.rb
 spec/sprinkle/package_spec.rb
 spec/sprinkle/policy_spec.rb

data/README.txt

@@ -62,17 +62,18 @@ appserver, database and webserver can be virtual packages, where the user will b
 multiple choices for the virtual package exist.
 
 Sprinkle is architected to be extendable in many ways, one of those areas is in its deployment of commands to
-remote hosts. Currently Sprinkle supports the use of Capistrano or Vlad to issue commands on remote hosts via ssh,
-but could also be extended to use any other command transport mechanism or be used to simply issue installation
-commands on the local system.
+remote hosts. Currently Sprinkle supports the use of Capistrano, Vlad, or a direct net/ssh connection to 
+issue commands on remote hosts via ssh, but could also be extended to use any other command transport mechanism
+desired. Sprinkle can also be configured to simply issue installation commands to provision the local system.
 
-An full example Sprinkle deployment script for deploying Rails (via gems), MySQL (via APT), and Apache (via source):
+An full example Sprinkle deployment script for deploying Rails (via gems), MySQL (via APT), Apache (via source) 
+and Git (via source with dependencies from APT):
 
     # Sprinkle Rails deployment script
     #
-    # This is an example Sprinkle script, configured to install Rails from gems, Apache and Ruby from source,
-    # and mysql from apt on an Ubuntu system. Installation is configured to run via Capistrano (and
-    # an accompanying deploy.rb recipe script). Source based packages are downloaded and built into
+    # This is an example Sprinkle script, configured to install Rails from gems, Apache, Ruby and Git from source,
+    # and mysql and Git dependencies from apt on an Ubuntu system. Installation is configured to run via 
+    # Capistrano (and an accompanying deploy.rb recipe script). Source based packages are downloaded and built into
     # /usr/local on the remote system.
     #
     # A sprinkle script is separated into 3 different sections. Packages, policies and deployment.
@@ -154,6 +155,18 @@ An full example Sprinkle deployment script for deploying Rails (via gems), MySQL
       version '1.0.5'
       requires :mongrel
     end
+    
+    package :git, :provides => :scm do
+      description 'Git Distributed Version Control'
+      version '1.5.6.3'
+      source "http://kernel.org/pub/software/scm/git/git-#{version}.tar.gz"
+      requires :git_dependencies
+    end
+
+    package :git_dependencies do
+      description 'Git Build Dependencies'
+      apt 'git', :dependencies_only => true
+    end
 
     # Policies
 
@@ -167,6 +180,7 @@ An full example Sprinkle deployment script for deploying Rails (via gems), MySQL
       requires :appserver
       requires :database
       requires :webserver
+      requires :scm
     end
 
     # Deployment

data/examples/packages/build_essential.rb

@@ -0,0 +1,9 @@
+## Special package, anything that defines a 'source' package means build-essential should be installed for Ubuntu
+
+package :build_essential do
+  description 'Build tools'
+  apt 'build-essential' do
+    # Update the sources and upgrade the lists before we build essentials
+    pre :install, ['aptitude update', 'aptitude safe-upgrade', 'aptitude full-upgrade']
+  end
+end

data/examples/packages/databases/mysql.rb

@@ -0,0 +1,13 @@
+package :mysql, :provides => :database do
+  description 'MySQL Database'
+  apt %w( mysql-server mysql-client libmysqlclient15-dev )
+end
+
+package :mysql_ruby_driver do
+  description 'Ruby MySQL database driver'
+  gem 'mysql'
+  
+  verify do
+    ruby_can_load 'mysql'
+  end
+end

data/examples/packages/databases/sqlite3.rb

@@ -0,0 +1,16 @@
+# Packages to install sqlite3 and the sqlite3 ruby driver.
+package :sqlite3, :provides => :database do
+  description 'SQLite3 database'
+  apt 'sqlite3'
+end
+
+package :sqlite3_ruby_driver do
+  description 'Ruby SQLite3 library.'
+  apt 'libsqlite3-dev libsqlite3-ruby1.8'
+  
+  requires :rubygems
+  
+  verify do
+    ruby_can_load 'sqlite3'
+  end
+end

data/examples/packages/phusion.rb

@@ -0,0 +1,55 @@
+# Contains software created by Phusion.nl which is Ruby Enterprise Edition
+# and mod_rails
+
+package :ruby_enterprise do
+  description 'Ruby Enterprise Edition'
+  version '1.8.6-20080810'
+  source 'http://rubyforge.org/frs/download.php/41040/ruby-enterprise-1.8.6-20080810.tar.gz' do
+    custom_install 'echo -en "\n\n\n\n" | ./installer'
+    
+    # Modify the passenger conf file to point to REE
+    post :install, 'sed -i "s|^PassengerRuby [/a-zA-Z0-9.]*$|PassengerRuby /opt/ruby-enterprise-1.8.6-20080810/bin/ruby|" /etc/apache2/extras/passenger.conf'
+  
+    # Restart apache
+    post :install, '/etc/init.d/apache2 restart'
+  end
+  
+  verify do
+    has_directory '/opt/ruby-enterprise-1.8.6-20080810'
+    has_executable '/opt/ruby-enterprise-1.8.6-20080810/bin/ruby'
+  end
+  
+  requires :apache
+  requires :passenger
+end
+
+package :passenger, :provides => :appserver do
+  description 'Phusion Passenger (mod_rails)'
+  gem 'passenger' do
+    post :install, 'echo -en "\n\n\n\n" | passenger-install-apache2-module'
+    
+    # Create the passenger conf file
+    post :install, 'mkdir /etc/apache2/extras'
+    post :install, 'touch /etc/apache2/extras/passenger.conf'
+    post :install, "echo 'Include /etc/apache2/extras/passenger.conf' >> /etc/apache2/apache2.conf"
+    
+    [%q(LoadModule passenger_module /usr/lib/ruby/gems/1.8/gems/passenger-2.0.3/ext/apache2/mod_passenger.so),
+    %q(PassengerRoot /usr/lib/ruby/gems/1.8/gems/passenger-2.0.3),
+    %q(PassengerRuby /usr/bin/ruby1.8),
+    %q(RailsEnv development)].each do |line|
+      post :install, "echo '#{line}' >> /etc/apache2/extras/passenger.conf"
+    end
+    
+    # Restart apache to note changes
+    post :install, '/etc/init.d/apache2 restart'
+  end
+  
+  verify do
+    has_file '/etc/apache2/extras/passenger.conf'
+    has_file '/usr/lib/ruby/gems/1.8/gems/passenger-2.0.3/ext/apache2/mod_passenger.so'
+    has_directory '/usr/lib/ruby/gems/1.8/gems/passenger-2.0.3'
+  end
+  
+  requires :apache
+  requires :apache2_prefork_dev
+end

data/examples/packages/ruby/rails.rb

@@ -0,0 +1,9 @@
+package :rails do
+  description 'Ruby on Rails'
+  gem 'rails'
+  version '2.1.0'
+  
+  verify do
+    has_executable 'rails'
+  end
+end

data/examples/packages/ruby/ruby.rb

@@ -0,0 +1,17 @@
+package :ruby do
+  description 'Ruby Virtual Machine'
+  version '1.8.6'
+  apt %q(ruby1.8-dev ruby1.8 ri1.8 rdoc1.8 irb1.8 libreadline-ruby1.8 libruby1.8 libopenssl-ruby) do
+    post :install, [%q(ln -s /usr/bin/ruby1.8 /usr/bin/ruby),
+    %q(ln -s /usr/bin/ri1.8 /usr/bin/ri),
+    %q(ln -s /usr/bin/rdoc1.8 /usr/bin/rdoc),
+    %q(ln -s /usr/bin/irb1.8 /usr/bin/irb)]
+  end
+  
+  verify 'binaries' do
+    has_file '/usr/bin/ruby1.8'
+    has_file '/usr/bin/ri1.8'
+    has_file '/usr/bin/rdoc1.8'
+    has_file '/usr/bin/irb1.8'
+  end
+end

data/examples/packages/ruby/rubygems.rb

@@ -0,0 +1,17 @@
+package :rubygems do
+  description 'Ruby Gems Package Management System'
+  version '1.2.0'
+  source "http://rubyforge.org/frs/download.php/38646/rubygems-#{version}.tgz" do
+    custom_install 'ruby setup.rb'
+    post :install, 'ln -s /usr/bin/gem1.8 /usr/bin/gem'
+    post :install, 'gem update'
+    post :install, 'gem update --system'
+  end
+  
+  verify 'binary' do
+    has_file '/usr/bin/gem1.8'
+    has_symlink '/usr/bin/gem', '/usr/bin/gem1.8'
+  end
+  
+  requires :ruby
+end

data/examples/packages/scm/git.rb

@@ -0,0 +1,11 @@
+package :git, :provides => :scm do
+  description 'Git Distributed Version Control'
+  version '1.5.6.3'
+  source "http://kernel.org/pub/software/scm/git/git-#{version}.tar.gz"
+  requires :git_dependencies
+end
+
+package :git_dependencies do
+  description 'Git Build Dependencies'
+  apt 'git', :dependencies_only => true
+end

data/examples/packages/scm/subversion.rb

@@ -0,0 +1,4 @@
+package :subversion, :provides => :scm do
+  description 'Subversion Version Control'
+  apt 'subversion'
+end

data/examples/packages/servers/apache.rb

@@ -0,0 +1,15 @@
+package :apache, :provides => :webserver do
+  description 'Apache2 web server.'
+  apt 'apache2 apache2.2-common apache2-mpm-prefork apache2-utils libexpat1 ssl-cert' do
+    post :install, 'a2enmod rewrite'
+  end
+  
+  verify do
+    has_process 'apache2'
+  end
+end
+
+package :apache2_prefork_dev do
+  description 'A dependency required by some packages.'
+  apt 'apache2-prefork-dev'
+end

data/examples/rails/packages/essential.rb

@@ -2,5 +2,8 @@
 
 package :build_essential do
   description 'Build tools'
-  apt 'build-essential'
+  apt 'build-essential' do
+    # Update the sources and upgrade the lists before we build essentials
+    pre :install, 'apt-get update'
+  end
 end

data/examples/rails/packages/scm.rb

@@ -0,0 +1,11 @@
+package :git, :provides => :scm do
+  description 'Git Distributed Version Control'
+  version '1.5.6.3'
+  source "http://kernel.org/pub/software/scm/git/git-#{version}.tar.gz"
+  requires :git_dependencies
+end
+
+package :git_dependencies do
+  description 'Git Build Dependencies'
+  apt 'git', :dependencies_only => true
+end

data/examples/rails/rails.rb

@@ -2,8 +2,8 @@
 
 # Annotated Example Sprinkle Rails deployment script
 #
-# This is an example Sprinkle script configured to install Rails from gems, Apache, Ruby and
-# Sphinx from source, and mysql from apt on an Ubuntu system.
+# This is an example Sprinkle script configured to install Rails from gems, Apache, Ruby,
+# Sphinx and Git from source, and mysql and Git dependencies from apt on an Ubuntu system.
 #
 # Installation is configured to run via capistrano (and an accompanying deploy.rb recipe script).
 # Source based packages are downloaded and built into /usr/local on the remote system.
@@ -22,6 +22,7 @@ require 'packages/rails'
 require 'packages/database'
 require 'packages/server'
 require 'packages/search'
+require 'packages/scm'
 
 
 # Policies
@@ -39,6 +40,7 @@ policy :rails, :roles => :app do
   requires :database
   requires :webserver
   requires :search
+  requires :scm
 end
 
 

data/lib/sprinkle.rb

@@ -2,11 +2,11 @@ require 'rubygems'
 require 'active_support'
 
 # Use active supports auto load mechanism
-Dependencies.load_paths << File.dirname(__FILE__)
+ActiveSupport::Dependencies.load_paths << File.dirname(__FILE__)
 
 # Configure active support to log auto-loading of dependencies
-#Dependencies::RAILS_DEFAULT_LOGGER = Logger.new($stdout)
-#Dependencies.log_activity = true
+#ActiveSupport::Dependencies::RAILS_DEFAULT_LOGGER = Logger.new($stdout)
+#ActiveSupport::Dependencies.log_activity = true
 
 # Load up extensions to existing classes
 Dir[File.dirname(__FILE__) + '/sprinkle/extensions/*.rb'].each { |e| require e }

data/lib/sprinkle/actors/local.rb

@@ -0,0 +1,26 @@
+module Sprinkle
+  module Actors
+    # = Local Delivery Method
+    #
+    # This actor implementation performs any given commands on your local system, as
+    # opposed to other implementations that generally run commands on a remote system
+    # via the network.
+    #
+    # This is useful if you'd like to use Sprinkle to provision your local machine. 
+    # To enable this actor, in your Sprinkle script specify the :local delivery mechanism. 
+    #
+    #   deployment do
+    #     delivery :local
+    #   end
+    #
+    # Note, your local machine will be assumed to be a member of all roles when applying policies
+    #
+    class Local
+      
+      def process(name, commands, roles, suppress_and_return_failures = false) #:nodoc:
+        commands.each { |command| system command }
+      end
+      
+    end
+  end
+end

data/lib/sprinkle/actors/ssh.rb

@@ -0,0 +1,81 @@
+require 'net/ssh/gateway'
+
+module Sprinkle
+  module Actors
+    class Ssh
+      attr_accessor :options
+
+      def initialize(options = {}, &block) #:nodoc:
+        @options = options.update(:user => 'root')
+        self.instance_eval &block if block
+      end
+
+      def roles(roles)
+        @options[:roles] = roles
+      end
+      
+      def gateway(gateway)
+        @options[:gateway] = gateway
+      end
+      
+      def user(user)
+        @options[:user] = user
+      end
+      
+      def process(name, commands, roles, suppress_and_return_failures = false)
+        return process_with_gateway(name, commands, roles) if gateway_defined?
+        process_direct(name, commands, roles)
+      end
+      
+      protected
+      
+        def process_with_gateway(name, commands, roles)
+          on_gateway do |gateway|
+            Array(roles).each { |role| execute_on_role(commands, role, gateway) }
+          end
+        end
+        
+        def process_direct(name, commands, roles)
+          Array(roles).each { |role| execute_on_role(commands, role) }
+        end
+        
+        def execute_on_role(commands, role, gateway = nil)
+          hosts = @options[:roles][role]
+          Array(hosts).each { |host| execute_on_host(commands, host, gateway) }
+        end
+        
+        def execute_on_host(commands, host, gateway = nil)
+          if gateway # SSH connection via gateway
+            gateway.ssh(host, @options[:user]) do |ssh|
+              execute_on_connection(commands, ssh)
+            end
+          else # direct SSH connection
+            Net::SSH.start(host, @options[:user]) do |ssh|
+              execute_on_connection(commands, ssh)
+            end
+          end
+        end
+        
+        def execute_on_connection(commands, connection)
+          Array(commands).each do |command|
+            connection.exec! command do |ch, stream, data|
+              logger.send((stream == :stderr ? 'error' : 'debug'), data)
+            end
+          end
+        end
+
+      private
+      
+        def gateway_defined?
+          !! @options[:gateway]
+        end
+        
+        def on_gateway(&block)
+          gateway = Net::SSH::Gateway.new(@options[:gateway], @options[:user])
+          block.call gateway
+        ensure
+          gateway.shutdown!
+        end
+    end
+  end
+end

data/lib/sprinkle/installers/apt.rb

@@ -30,20 +30,21 @@ module Sprinkle
       attr_accessor :packages #:nodoc:
 
       def initialize(parent, *packages, &block) #:nodoc:
-        super parent, &block
         packages.flatten!
         
         options = { :dependencies_only => false }
         options.update(packages.pop) if packages.last.is_a?(Hash)
         
-        @command = options[:dependencies_only] ? 'build-dep' : 'install'
+        super parent, options, &block
+        
         @packages = packages
       end
 
       protected
 
         def install_commands #:nodoc:
-          "DEBCONF_TERSE='yes' DEBIAN_PRIORITY='critical' DEBIAN_FRONTEND=noninteractive apt-get -qyu #{@command} #{@packages.join(' ')}"
+          command = @options[:dependencies_only] ? 'build-dep' : 'install'
+          "DEBCONF_TERSE='yes' DEBIAN_PRIORITY='critical' DEBIAN_FRONTEND=noninteractive apt-get -qyu #{command} #{@packages.join(' ')}"
         end
 
     end

data/lib/sprinkle/installers/deb.rb

@@ -0,0 +1,32 @@
+module Sprinkle
+  module Installers
+    # = Deb Package Installer
+    #
+    # The Deb installer installs deb packages sourced from a remote URL
+    # 
+    # == Example Usage
+    #
+    # Installing the magic_beans deb.
+    #
+    #   package :magic_beans do
+    #     deb 'http://debs.example.com/magic_beans.deb'
+    #   end
+    #
+    class Deb < Installer
+      attr_accessor :packages #:nodoc:
+
+      def initialize(parent, packages, &block) #:nodoc:
+        super parent, &block
+        packages = [packages] unless packages.is_a? Array
+        @packages = packages
+      end
+
+      protected
+
+        def install_commands #:nodoc:
+          "wget -cq --directory-prefix=/tmp #{@packages.join(' ')}; dpkg -i #{@packages.collect{|p| "/tmp/#{p}"}.join(" ")}"
+        end
+
+    end
+  end
+end

data/lib/sprinkle/installers/yum.rb

@@ -0,0 +1,37 @@
+module Sprinkle
+  module Installers
+    # = Yum Package Installer
+    #
+    # The Yum package installer installs RPM packages.
+    # 
+    # == Example Usage
+    #
+    # Installing the magic_beans RPM via Yum. Its all the craze these days.
+    #
+    #   package :magic_beans do
+    #     yum 'magic_beans'
+    #   end
+    #
+    # You may also specify multiple rpms as an array:
+    #
+    #   package :magic_beans do
+    #     yum %w(magic_beans magic_sauce)
+    #   end
+    class Yum < Installer
+      attr_accessor :packages #:nodoc:
+
+      def initialize(parent, packages, &block) #:nodoc:
+        super parent, &block
+        packages = [packages] unless packages.is_a? Array
+        @packages = packages
+      end
+
+      protected
+
+        def install_commands #:nodoc:
+          "yum #{@packages.join(' ')} -y"
+        end
+
+    end
+  end
+end

data/lib/sprinkle/package.rb

@@ -165,6 +165,8 @@ module Sprinkle
       end
       
       def process_verifications(deployment, roles, pre = false)
+        return if @verifications.blank?
+        
         if pre
           logger.info "--> Checking if #{self.name} is already installed for roles: #{roles}"
         else

data/lib/sprinkle/version.rb

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

data/spec/sprinkle/actors/local_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sprinkle::Actors::Local do
+
+  before do
+    @local = Sprinkle::Actors::Local.new
+  end
+
+  describe 'when processing commands' do
+
+    before do
+      @commands = %w( op1 op2 )
+      @roles    = %w( app )
+      @name     = 'name'
+    
+      @local.stub!(:system).and_return
+    end
+
+    it 'should run the commands on the local system' do
+      @local.should_receive(:system).twice.and_return
+    end
+    
+    after do
+      @local.process @name, @commands, @roles
+    end
+
+  end
+
+end

data/spec/sprinkle/configurable_spec.rb

@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Sprinkle::Configurable do
+  module MyPrefix
+    class Configurable
+      include Sprinkle::Configurable
+    end
+  end
+  
+  before do
+    @configurable = MyPrefix::Configurable.new
+    @default = Proc.new { }
+    @defaults = { :configurable => @default }
+    @deployment.stub!(:defaults).and_return(@defaults)
+    @deployment.stub!(:style)
+  end
+
+  it 'should be configurable via external defaults' do
+    @configurable.should respond_to(:defaults)
+  end
+
+  it 'should select the defaults for the particular concrete installer class' do
+    @deployment.should_receive(:defaults).and_return(@defaults)
+    @defaults.should_receive(:[]).with(:configurable).and_return(@default)
+  end
+
+  it 'should configure the installer delivery mechansim' do
+    @configurable.should_receive(:instance_eval)
+  end
+
+  it 'should maintain an options hash set arbitrarily via method missing' do
+    @configurable.instance_eval do
+      hsv 'gts'
+    end
+    @configurable.hsv.should == 'gts'
+  end
+  
+  it 'should allow the delivery instance variable to be accessed' do
+    @configurable.delivery = "string"
+    @configurable.instance_variable_get(:@delivery).should eql("string")
+  end
+
+  after do
+    @configurable.defaults(@deployment)
+  end
+end

data/spec/sprinkle/installers/apt_spec.rb

@@ -22,10 +22,6 @@ describe Sprinkle::Installers::Apt do
       @installer.packages.should == ['gcc', 'gdb', 'g++']
     end
 
-  end
-
-  describe 'when created for dependencies only install' do
-
     it 'should remove options from packages list' do
       @installer = create_apt 'ruby', :dependencies_only => true
       @installer.packages.should == [ 'ruby' ]
@@ -62,7 +58,7 @@ describe Sprinkle::Installers::Apt do
   describe 'during dependencies only installation' do
 
     before do
-      @installer = create_apt 'ruby', :dependencies_only => true
+      @installer = create_apt('ruby') { dependencies_only true }
       @install_commands = @installer.send :install_commands
     end
 

data/spec/sprinkle/installers/yum_spec.rb

@@ -0,0 +1,49 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sprinkle::Installers::Yum do
+
+  before do
+    @package = mock(Sprinkle::Package, :name => 'package')
+  end
+
+  def create_rpm(rpms, &block)
+    Sprinkle::Installers::Yum.new(@package, rpms, &block)
+  end
+
+  describe 'when created' do
+
+    it 'should accept a single package to install' do
+      @installer = create_rpm 'ruby'
+      @installer.packages.should == [ 'ruby' ]
+    end
+
+    it 'should accept an array of packages to install' do
+      @installer = create_rpm %w( gcc gdb g++ )
+      @installer.packages.should == ['gcc', 'gdb', 'g++']
+    end
+
+  end
+
+  describe 'during installation' do
+
+    before do
+      @installer = create_rpm 'ruby' do
+        pre :install, 'op1'
+        post :install, 'op2'
+      end
+      @install_commands = @installer.send :install_commands
+    end
+
+    it 'should invoke the rpm installer for all specified packages' do
+      @install_commands.should =~ /yum ruby -y/
+    end
+
+    it 'should automatically insert pre/post commands for the specified package' do
+      @installer.send(:install_sequence).should == [ 'op1', 'yum ruby -y', 'op2' ]
+    end
+
+    it 'should install a specific version if defined'
+
+  end
+
+end

data/sprinkle.gemspec

@@ -1,16 +1,16 @@
 Gem::Specification.new do |s|
   s.name = %q{sprinkle}
-  s.version = "0.1.6"
+  s.version = "0.1.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{2008-07-19}
+  s.date = %q{2008-11-04}
   s.default_executable = %q{sprinkle}
   s.description = %q{Ruby DSL based software provisioning tool}
   s.email = ["crafterm@redartisan.com", "mitchell.hashimoto@citrusbyte.com"]
   s.executables = ["sprinkle"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = ["CREDITS", "History.txt", "MIT-LICENSE", "Manifest.txt", "README.txt", "Rakefile", "bin/sprinkle", "config/hoe.rb", "config/requirements.rb", "examples/rails/README", "examples/rails/deploy.rb", "examples/rails/packages/database.rb", "examples/rails/packages/essential.rb", "examples/rails/packages/rails.rb", "examples/rails/packages/search.rb", "examples/rails/packages/server.rb", "examples/rails/rails.rb", "examples/sprinkle/sprinkle.rb", "lib/sprinkle.rb", "lib/sprinkle/actors/actors.rb", "lib/sprinkle/actors/capistrano.rb", "lib/sprinkle/actors/vlad.rb", "lib/sprinkle/configurable.rb", "lib/sprinkle/deployment.rb", "lib/sprinkle/extensions/arbitrary_options.rb", "lib/sprinkle/extensions/array.rb", "lib/sprinkle/extensions/blank_slate.rb", "lib/sprinkle/extensions/dsl_accessor.rb", "lib/sprinkle/extensions/string.rb", "lib/sprinkle/extensions/symbol.rb", "lib/sprinkle/installers/apt.rb", "lib/sprinkle/installers/gem.rb", "lib/sprinkle/installers/installer.rb", "lib/sprinkle/installers/rake.rb", "lib/sprinkle/installers/rpm.rb", "lib/sprinkle/installers/source.rb", "lib/sprinkle/package.rb", "lib/sprinkle/policy.rb", "lib/sprinkle/script.rb", "lib/sprinkle/verifiers/directory.rb", "lib/sprinkle/verifiers/executable.rb", "lib/sprinkle/verifiers/file.rb", "lib/sprinkle/verifiers/process.rb", "lib/sprinkle/verifiers/ruby.rb", "lib/sprinkle/verifiers/symlink.rb", "lib/sprinkle/verify.rb", "lib/sprinkle/version.rb", "script/destroy", "script/generate", "spec/spec.opts", "spec/spec_helper.rb", "spec/sprinkle/actors/capistrano_spec.rb", "spec/sprinkle/configurable_spec.rb", "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/gem_spec.rb", "spec/sprinkle/installers/installer_spec.rb", "spec/sprinkle/installers/rpm_spec.rb", "spec/sprinkle/installers/source_spec.rb", "spec/sprinkle/package_spec.rb", "spec/sprinkle/policy_spec.rb", "spec/sprinkle/script_spec.rb", "spec/sprinkle/sprinkle_spec.rb", "spec/sprinkle/verify_spec.rb", "sprinkle.gemspec", "tasks/deployment.rake", "tasks/environment.rake", "tasks/rspec.rake"]
+  s.files = ["CREDITS", "History.txt", "MIT-LICENSE", "Manifest.txt", "README.txt", "Rakefile", "bin/sprinkle", "config/hoe.rb", "config/requirements.rb", "examples/packages/build_essential.rb", "examples/packages/databases/mysql.rb", "examples/packages/databases/sqlite3.rb", "examples/packages/phusion.rb", "examples/packages/ruby/rails.rb", "examples/packages/ruby/ruby.rb", "examples/packages/ruby/rubygems.rb", "examples/packages/scm/git.rb", "examples/packages/scm/subversion.rb", "examples/packages/servers/apache.rb", "examples/rails/README", "examples/rails/deploy.rb", "examples/rails/packages/database.rb", "examples/rails/packages/essential.rb", "examples/rails/packages/rails.rb", "examples/rails/packages/scm.rb", "examples/rails/packages/search.rb", "examples/rails/packages/server.rb", "examples/rails/rails.rb", "examples/sprinkle/sprinkle.rb", "lib/sprinkle.rb", "lib/sprinkle/actors/actors.rb", "lib/sprinkle/actors/capistrano.rb", "lib/sprinkle/actors/local.rb", "lib/sprinkle/actors/ssh.rb", "lib/sprinkle/actors/vlad.rb", "lib/sprinkle/configurable.rb", "lib/sprinkle/deployment.rb", "lib/sprinkle/extensions/arbitrary_options.rb", "lib/sprinkle/extensions/array.rb", "lib/sprinkle/extensions/blank_slate.rb", "lib/sprinkle/extensions/dsl_accessor.rb", "lib/sprinkle/extensions/string.rb", "lib/sprinkle/extensions/symbol.rb", "lib/sprinkle/installers/apt.rb", "lib/sprinkle/installers/deb.rb", "lib/sprinkle/installers/gem.rb", "lib/sprinkle/installers/installer.rb", "lib/sprinkle/installers/rake.rb", "lib/sprinkle/installers/rpm.rb", "lib/sprinkle/installers/source.rb", "lib/sprinkle/installers/yum.rb", "lib/sprinkle/package.rb", "lib/sprinkle/policy.rb", "lib/sprinkle/script.rb", "lib/sprinkle/verifiers/directory.rb", "lib/sprinkle/verifiers/executable.rb", "lib/sprinkle/verifiers/file.rb", "lib/sprinkle/verifiers/process.rb", "lib/sprinkle/verifiers/ruby.rb", "lib/sprinkle/verifiers/symlink.rb", "lib/sprinkle/verify.rb", "lib/sprinkle/version.rb", "script/destroy", "script/generate", "spec/spec.opts", "spec/spec_helper.rb", "spec/sprinkle/actors/capistrano_spec.rb", "spec/sprinkle/actors/local_spec.rb", "spec/sprinkle/configurable_spec.rb", "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/gem_spec.rb", "spec/sprinkle/installers/installer_spec.rb", "spec/sprinkle/installers/rpm_spec.rb", "spec/sprinkle/installers/yum_spec.rb", "spec/sprinkle/installers/source_spec.rb", "spec/sprinkle/package_spec.rb", "spec/sprinkle/policy_spec.rb", "spec/sprinkle/script_spec.rb", "spec/sprinkle/sprinkle_spec.rb", "spec/sprinkle/verify_spec.rb", "sprinkle.gemspec", "tasks/deployment.rake", "tasks/environment.rake", "tasks/rspec.rake"]
   s.has_rdoc = true
   s.homepage = %q{http://sprinkle.rubyforge.org}
   s.rdoc_options = ["--main", "README.txt"]
@@ -27,17 +27,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])
       s.add_runtime_dependency(%q<highline>, [">= 1.4.0"])
       s.add_runtime_dependency(%q<capistrano>, [">= 2.2.0"])
-      s.add_development_dependency(%q<hoe>, [">= 1.7.0"])
+      s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.0.2"])
       s.add_dependency(%q<highline>, [">= 1.4.0"])
       s.add_dependency(%q<capistrano>, [">= 2.2.0"])
-      s.add_dependency(%q<hoe>, [">= 1.7.0"])
+      s.add_dependency(%q<hoe>, [">= 1.8.2"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.0.2"])
     s.add_dependency(%q<highline>, [">= 1.4.0"])
     s.add_dependency(%q<capistrano>, [">= 2.2.0"])
-    s.add_dependency(%q<hoe>, [">= 1.7.0"])
+    s.add_dependency(%q<hoe>, [">= 1.8.2"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-21 00:00:00 +10:00
+date: 2008-11-04 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.2
     version: 
 description: Ruby DSL based software provisioning tool
 email: 
@@ -73,11 +73,22 @@ files:
 - bin/sprinkle
 - config/hoe.rb
 - config/requirements.rb
+- examples/packages/build_essential.rb
+- examples/packages/databases/mysql.rb
+- examples/packages/databases/sqlite3.rb
+- examples/packages/phusion.rb
+- examples/packages/ruby/rails.rb
+- examples/packages/ruby/ruby.rb
+- examples/packages/ruby/rubygems.rb
+- examples/packages/scm/git.rb
+- examples/packages/scm/subversion.rb
+- examples/packages/servers/apache.rb
 - examples/rails/README
 - examples/rails/deploy.rb
 - examples/rails/packages/database.rb
 - examples/rails/packages/essential.rb
 - examples/rails/packages/rails.rb
+- examples/rails/packages/scm.rb
 - examples/rails/packages/search.rb
 - examples/rails/packages/server.rb
 - examples/rails/rails.rb
@@ -85,6 +96,8 @@ files:
 - lib/sprinkle.rb
 - lib/sprinkle/actors/actors.rb
 - lib/sprinkle/actors/capistrano.rb
+- lib/sprinkle/actors/local.rb
+- lib/sprinkle/actors/ssh.rb
 - lib/sprinkle/actors/vlad.rb
 - lib/sprinkle/configurable.rb
 - lib/sprinkle/deployment.rb
@@ -95,11 +108,13 @@ files:
 - lib/sprinkle/extensions/string.rb
 - lib/sprinkle/extensions/symbol.rb
 - lib/sprinkle/installers/apt.rb
+- lib/sprinkle/installers/deb.rb
 - lib/sprinkle/installers/gem.rb
 - lib/sprinkle/installers/installer.rb
 - lib/sprinkle/installers/rake.rb
 - lib/sprinkle/installers/rpm.rb
 - lib/sprinkle/installers/source.rb
+- lib/sprinkle/installers/yum.rb
 - lib/sprinkle/package.rb
 - lib/sprinkle/policy.rb
 - lib/sprinkle/script.rb
@@ -116,6 +131,8 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/sprinkle/actors/capistrano_spec.rb
+- spec/sprinkle/actors/local_spec.rb
+- spec/sprinkle/configurable_spec.rb
 - spec/sprinkle/deployment_spec.rb
 - spec/sprinkle/extensions/array_spec.rb
 - spec/sprinkle/extensions/string_spec.rb
@@ -123,6 +140,7 @@ files:
 - spec/sprinkle/installers/gem_spec.rb
 - spec/sprinkle/installers/installer_spec.rb
 - spec/sprinkle/installers/rpm_spec.rb
+- spec/sprinkle/installers/yum_spec.rb
 - spec/sprinkle/installers/source_spec.rb
 - spec/sprinkle/package_spec.rb
 - spec/sprinkle/policy_spec.rb