crafterm-sprinkle 0.1.4 → 0.1.5

data/CREDITS

@@ -3,12 +3,14 @@
 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)
+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)

data/Manifest.txt

@@ -2,7 +2,7 @@ CREDITS
 History.txt
 MIT-LICENSE
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 bin/sprinkle
 config/hoe.rb

data/{README.txt → README.rdoc}

@@ -1,5 +1,6 @@
 = SPRINKLE
 
+http://redartisan.com/2008/5/27/sprinkle-intro
 http://github.com/crafterm/sprinkle
 
 == DESCRIPTION:
@@ -17,7 +18,7 @@ An example package description follows:
     package :ruby do
       description 'Ruby Virtual Machine'
       version '1.8.6'
-      source "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-#{version}-p111.tar.gz" # implicit :style => :gnu
+      source "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-#{version}-p111.tar.gz"
       requires :ruby_dependencies
     end
 
@@ -31,7 +32,8 @@ Since packages come in many forms (eg. gems, pre-compiled debs, compressed sourc
 many different installer types, giving you the most amount of flexibility of how you'd like software installed.
 New installer types can be added into the system easily.
 
-For example, you could install Rails via gems, nginx via source, and mysql via APT.
+For example, you could install Rails via gems, nginx via source, and mysql via APT, while retaining the flexibility
+of changing installer types as software is updated upstream.
 
 Sprinkle also supports dependencies between packages, allowing you specify pre-requisites that need to be
 installed in order.
@@ -41,28 +43,29 @@ Packages can be grouped into polices to define several packages that should be i
 An example policy:
 
     policy :rails, :roles => :app do
-      requires :rails, :version => '2.0.2'
+      requires :rails, :version => '2.1.0'
       requires :appserver
       requires :database
       requires :webserver
     end
 
 This defines a policy called Rails, that applies to machines of role :app. The policy includes the packages
-rails (version 2.0.2), appserver, database and webserver.
+rails (version 2.1.0), appserver, database and webserver.
 
 appserver, database and webserver can be virtual packages, where the user will be prompted for selection if
 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 uses Capistrano to issue commands on remote hosts via ssh, but it could also
-conceivably use vlad, etc, or be used to simply issue installation commands on the local system.
+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.
 
 An full example Sprinkle deployment script for deploying Rails (via gems), MySQL (via APT), and Apache (via source):
 
     # 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
+    # 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
     # /usr/local on the remote system.
     #
@@ -85,15 +88,10 @@ An full example Sprinkle deployment script for deploying Rails (via gems), MySQL
 
     # Packages
 
-    package :build_essential do # special package, anything that uses a 'source' installer will have build-essential installed for Ubuntu
-      description 'Build tools'
-      apt 'build-essential'
-    end
-
     package :ruby do
       description 'Ruby Virtual Machine'
       version '1.8.6'
-      source "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-#{version}-p111.tar.gz" # implicit :style => :gnu
+      source "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-#{version}-p111.tar.gz"
       requires :ruby_dependencies
     end
 
@@ -109,7 +107,7 @@ An full example Sprinkle deployment script for deploying Rails (via gems), MySQL
 
     package :apache, :provides => :webserver do
       description 'Apache 2 HTTP Server'
-      version '2.2.6'
+      version '2.2.9'
       source "http://apache.wildit.net.au/httpd/httpd-#{version}.tar.bz2" do
         enable %w( mods-shared=all proxy proxy-balancer proxy-http rewrite cache headers ssl deflate so )
         prefix "/opt/local/apache2-#{version}"
@@ -125,8 +123,8 @@ An full example Sprinkle deployment script for deploying Rails (via gems), MySQL
 
     package :rubygems do
       description 'Ruby Gems Package Management System'
-      version '1.0.1'
-      source "http://rubyforge.org/frs/download.php/29548/rubygems-#{version}.tgz" do
+      version '1.2.0'
+      source "http://rubyforge.org/frs/download.php/38646/rubygems-#{version}.tgz" do
         custom_install 'ruby setup.rb'
       end
       requires :ruby
@@ -135,13 +133,13 @@ An full example Sprinkle deployment script for deploying Rails (via gems), MySQL
     package :rails do
       description 'Ruby on Rails'
       gem 'rails'
-      version '2.0.2'
+      version '2.1.0'
     end
 
     package :mongrel do
       description 'Mongrel Application Server'
       gem 'mongrel'
-      version '1.1.4'
+      version '1.1.5'
     end
 
     package :mongrel_cluster, :provides => :appserver do
@@ -159,7 +157,7 @@ An full example Sprinkle deployment script for deploying Rails (via gems), MySQL
     # the user is requested to select which one to use.
 
     policy :rails, :roles => :app do
-      requires :rails, :version => '2.0.2'
+      requires :rails, :version => '2.1.0'
       requires :appserver
       requires :database
       requires :webserver
@@ -187,6 +185,8 @@ An full example Sprinkle deployment script for deploying Rails (via gems), MySQL
 
     end
 
+Please see the examples directory for more complete examples of Sprinkle deployment scripts.
+
 Sprinkle is a work in progress and I'm excited to hear if anyone finds it useful - please feel free to
 comment, ask any questions, or send in any ideas, patches, bugs. All most welcome.
 

data/lib/sprinkle/installers/apt.rb

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

data/lib/sprinkle/installers/source.rb

@@ -106,7 +106,7 @@ module Sprinkle
         end
 
         def build_dir
-          "#{@options[:builds]}/#{base_dir}"
+          "#{@options[:builds]}/#{options[:custom_dir] || base_dir}"
         end
 
         def base_dir
@@ -115,6 +115,7 @@ module Sprinkle
           end
           raise "Unknown base path for source archive: #{@source}, please update code knowledge"
         end
+        
     end
   end
 end

data/lib/sprinkle/package.rb

@@ -27,12 +27,12 @@ module Sprinkle
         self.instance_eval &block
       end
 
-      def apt(*names)
-        @installer = Sprinkle::Installers::Apt.new(self, *names)
+      def apt(*names, &block)
+        @installer = Sprinkle::Installers::Apt.new(self, *names, &block)
       end
 
-      def rpm(*names)
-        @installer = Sprinkle::Installers::Rpm.new(self, *names)
+      def rpm(*names, &block)
+        @installer = Sprinkle::Installers::Rpm.new(self, *names, &block)
       end
 
       def gem(name, options = {}, &block)

data/lib/sprinkle/version.rb

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

data/spec/sprinkle/installers/apt_spec.rb

@@ -6,8 +6,8 @@ describe Sprinkle::Installers::Apt do
     @package = mock(Sprinkle::Package, :name => 'package')
   end
 
-  def create_apt(debs, &block)
-    Sprinkle::Installers::Apt.new(@package, debs, &block)
+  def create_apt(*debs, &block)
+    Sprinkle::Installers::Apt.new(@package, *debs, &block)
   end
 
   describe 'when created' do
@@ -24,6 +24,15 @@ describe Sprinkle::Installers::Apt do
 
   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' ]
+    end
+
+  end
+
   describe 'during installation' do
 
     before do
@@ -49,5 +58,17 @@ describe Sprinkle::Installers::Apt do
     it 'should install a specific version if defined'
 
   end
+  
+  describe 'during dependencies only installation' do
 
+    before do
+      @installer = create_apt 'ruby', :dependencies_only => true
+      @install_commands = @installer.send :install_commands
+    end
+
+    it 'should invoke the apt installer with build-dep command for all specified packages' do
+      @install_commands.should =~ /apt-get -qyu build-dep ruby/
+    end
+    
+  end
 end

data/spec/sprinkle/installers/source_spec.rb

@@ -171,10 +171,10 @@ describe Sprinkle::Installers::Source do
         @installer.defaults(@deployment)
       end
 
-      it 'should store the custom insatll commands' do
+      it 'should store the custom install commands' do
         @installer.options[:custom_install].should == 'ruby setup.rb'
       end
-
+      
       it 'should identify as having a custom install command' do
         @installer.should be_custom_install
       end
@@ -188,12 +188,28 @@ describe Sprinkle::Installers::Source do
       end
 
       it 'should install the source using a custom installation command' do
-        @installer.send(:custom_install_commands).should == [ "bash -c 'cd /usr/builds/ruby-1.8.6-p111 && ruby setup.rb >> package-install.log 2>&1'" ]
+        @installer.send(:custom_install_commands).first.should =~ /ruby setup.rb/
       end
-
+      
       it 'should be run relative to the source build area' do
         @installer.send(:custom_install_commands).first.should =~ %r{cd /usr/builds/ruby-1.8.6-p111}
       end
+      
+      describe 'with a customized directory' do
+        
+        before do
+          @installer.options[:custom_dir] = 'test'
+        end
+        
+        it 'should install the source from the custom dir path' do
+          @installer.send(:custom_install_commands).first.should =~ /test/
+        end
+        
+        it 'should store the custom build dir path' do
+          @installer.options[:custom_dir].should == 'test'
+        end
+        
+      end
 
     end
 

data/spec/sprinkle/package_spec.rb

@@ -8,6 +8,24 @@ describe Sprinkle::Package do
     @empty = Proc.new { }
     @opts = { }
   end
+  
+  # Kind of a messy way to do this but it works and DRYs out
+  # the specs. Checks to make sure an installer is receiving
+  # the block passed to it throught the package block.
+  def check_block_forwarding_on(installer)
+    eval(<<CODE)
+    pre_count = 0
+    lambda {
+      pkg = package @name do
+        #{installer} 'archive' do
+          pre :install, 'preOp'
+        end
+      end
+      
+      pre_count = pkg.installer.instance_variable_get(:@pre)[:install].length
+    }.should change { pre_count }.by(1)
+CODE
+  end
 
   describe 'when created' do
 
@@ -126,6 +144,10 @@ describe Sprinkle::Package do
       pkg.should respond_to(:source)
       pkg.installer.class.should == Sprinkle::Installers::Source
     end
+    
+    it 'should forward block to installer superclass' do
+      check_block_forwarding_on(:source)
+    end
 
     it 'should automatically add a build essential recommendation' do
       pkg = package @name do
@@ -135,6 +157,18 @@ describe Sprinkle::Package do
     end
 
   end
+  
+  describe 'with an apt installer' do
+    it 'should forward block to installer superclass' do
+      check_block_forwarding_on(:apt)
+    end
+  end
+  
+  describe 'with an rpm installer' do
+    it 'should forward block to installer superclass' do
+      check_block_forwarding_on(:rpm)
+    end
+  end
 
   describe 'with an gem installer' do
 
@@ -144,6 +178,10 @@ describe Sprinkle::Package do
       end
       pkg.recommends.should include(:rubygems)
     end
+    
+    it 'should forward block to installer superclass' do
+      check_block_forwarding_on(:gem)
+    end
 
   end
 

data/sprinkle.gemspec

@@ -1,16 +1,16 @@
 Gem::Specification.new do |s|
   s.name = %q{sprinkle}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcus Crafter"]
-  s.date = %q{2008-07-13}
+  s.date = %q{2008-07-16}
   s.default_executable = %q{sprinkle}
   s.description = %q{Ruby DSL based software provisioning tool}
   s.email = ["crafterm@redartisan.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/merb/deploy.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/capistrano.rb", "lib/sprinkle/actors/vlad.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/version.rb", "script/destroy", "script/generate", "spec/spec.opts", "spec/spec_helper.rb", "spec/sprinkle/actors/capistrano_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", "sprinkle.gemspec", "tasks/deployment.rake", "tasks/environment.rake", "tasks/rspec.rake"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
+  s.files = ["CREDITS", "History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "bin/sprinkle", "config/hoe.rb", "config/requirements.rb", "examples/merb/deploy.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/capistrano.rb", "lib/sprinkle/actors/vlad.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/version.rb", "script/destroy", "script/generate", "spec/spec.opts", "spec/spec_helper.rb", "spec/sprinkle/actors/capistrano_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", "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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: crafterm-sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-13 00:00:00 -07:00
+date: 2008-07-16 00:00:00 -07:00
 default_executable: sprinkle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,13 +58,12 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- README.txt
 files: 
 - CREDITS
 - History.txt
 - MIT-LICENSE
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - bin/sprinkle
 - config/hoe.rb