crafterm-sprinkle 0.1.2 → 0.1.4

data/CREDITS

@@ -10,4 +10,5 @@ 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)
+Eric Hodel       (http://blog.segment7.net)
+Pete Yandell     (http://notahat.com)

data/examples/rails/packages/rails.rb

@@ -14,8 +14,8 @@ end
 
 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
@@ -24,5 +24,5 @@ end
 package :rails do
   description 'Ruby on Rails'
   gem 'rails'
-  version '2.0.2'
+  version '2.1.0'
 end

data/examples/rails/packages/server.rb

@@ -13,8 +13,8 @@ end
 
 package :apache, :provides => :webserver do
   description 'Apache 2 HTTP Server'
-  version '2.2.6'
-  source "http://apache.wildit.net.au/httpd/httpd-#{version}.tar.bz2" do
+  version '2.2.9'
+  source "http://www.apache.org/dist/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}"
     post :install, 'install -m 755 support/apachectl /etc/init.d/apache2', 'update-rc.d -f apache2 defaults'

data/examples/rails/rails.rb

@@ -34,7 +34,7 @@ require 'packages/search'
 #   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

data/examples/sprinkle/sprinkle.rb

@@ -1,56 +1,33 @@
-#!/usr/bin/env sprinkle -s
+#!/usr/bin/env sprinkle -c -s
 
-# Example of a simple Sprinkle script to install a single gem on a remote host.
+# Example of the simplest Sprinkle script to install a single gem on a remote host. This
+# particular script assumes that rubygems (and ruby, etc) are already installed on the remote
+# host. To see a larger example of installing an entire ruby, rubygems, gem stack from source,
+# please see the rails example.
 
-# Packages, sprinkle and its dependencies including rubygems and ruby, delivery mechanism
-# uses Vlad
-
-package :build_essential do
-  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
-  requires :ruby_dependencies
-end
-
-package :ruby_dependencies do
-  description 'Ruby Virtual Machine Build Dependencies'
-  apt %w( bison zlib1g-dev libssl-dev libreadline5-dev libncurses5-dev file )
-end
-
-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
-    custom_install 'ruby setup.rb'
-  end
-  requires :ruby
-end
+# Packages, only sprinkle is defined in this world
 
 package :sprinkle do
   description 'Sprinkle Provisioning Tool'
-  gem 'sprinkle' do
+  gem 'crafterm-sprinkle' do
     source 'http://gems.github.com' # use alternate gem server
+    #repository '/opt/local/gems'   # specify an alternate local gem repository
   end
 end
 
 
-# Policy, sprinkle policy requires only the sprinkle gem
+# Policies, sprinkle policy requires only the sprinkle gem
 
 policy :sprinkle, :roles => :app do
   requires :sprinkle
 end
 
 
-# Deployment
+# Deployment settings
 
 deployment do
 
-  # mechanism for deployment
+  # use vlad for deployment
   delivery :vlad do
     role :app, 'yourhost.com'
   end

data/lib/sprinkle/installers/apt.rb

@@ -11,7 +11,7 @@ module Sprinkle
 
       protected
 
-        def install_sequence
+        def install_commands
           "DEBCONF_TERSE='yes' DEBIAN_PRIORITY='critical' DEBIAN_FRONTEND=noninteractive apt-get -qyu install #{@packages.join(' ')}"
         end
 

data/lib/sprinkle/installers/gem.rb

@@ -20,12 +20,14 @@ module Sprinkle
 
         # rubygems 0.9.5+ installs dependencies by default, and does platform selection
 
-        def install_sequence
+        def install_commands
           cmd = "gem install #{gem}"
           cmd << " --version '#{version}'" if version
           cmd << " --source #{source}" if source
+          cmd << " --install-dir #{repository}" if repository
           cmd
         end
+
     end
   end
 end

data/lib/sprinkle/installers/installer.rb

@@ -1,14 +1,25 @@
 module Sprinkle
   module Installers
     class Installer
-      attr_accessor :delivery, :package, :options
+      attr_accessor :delivery, :package, :options, :pre, :post
 
       def initialize(package, options = {}, &block)
         @package = package
         @options = options
+        @pre = {}; @post = {}
         self.instance_eval(&block) if block
       end
 
+      def pre(stage, *commands)
+        @pre[stage] ||= []
+        @pre[stage] += commands
+      end
+
+      def post(stage, *commands)
+        @post[stage] ||= []
+        @post[stage] += commands
+      end
+
       def defaults(deployment)
         defaults = deployment.defaults[self.class.name.split(/::/).last.downcase.to_sym]
         self.instance_eval(&defaults) if defaults
@@ -39,9 +50,36 @@ module Sprinkle
 
       protected
 
+        # Installation is separated into two styles that concrete derivative installer classes
+        # can implement.
+        #
+        # Simple installers that issue a single or set of commands can overwride
+        # install_commands (eg. apt, gem, rpm). Pre/post install commands are included in this
+        # style for free.
+        #
+        # More complicated installers that have different stages, and require pre/post commands
+        # within stages can override install_sequence and take complete control of the install
+        # command sequence construction (eg. source based installer).
+
         def install_sequence
+          commands = pre_commands(:install) + [ install_commands ] + post_commands(:install)
+          commands.flatten
+        end
+
+        def install_commands
           raise 'Concrete installers implement this to specify commands to run to install their respective packages'
         end
+
+        def pre_commands(stage)
+          dress @pre[stage] || [], :pre
+        end
+
+        def post_commands(stage)
+          dress @post[stage] || [], :post
+        end
+
+        def dress(commands, stage); commands; end
+
     end
   end
 end

data/lib/sprinkle/installers/rake.rb

@@ -8,9 +8,10 @@ module Sprinkle
 
       protected
 
-        def install_sequence
+        def install_commands
           "rake #{@commands.join(' ')}"
         end
+
     end
   end
 end

data/lib/sprinkle/installers/rpm.rb

@@ -11,9 +11,9 @@ module Sprinkle
 
       protected
 
-      def install_sequence
-        "rpm -Uvh #{@packages.join(' ')}"
-      end
+        def install_commands
+          "rpm -Uvh #{@packages.join(' ')}"
+        end
 
     end
   end

data/lib/sprinkle/installers/source.rb

@@ -1,24 +1,13 @@
 module Sprinkle
   module Installers
     class Source < Installer
-      attr_accessor :source, :pre, :post
+      attr_accessor :source
 
       def initialize(parent, source, options = {}, &block)
-        @pre = {}; @post = {}
         @source = source
         super parent, options, &block
       end
 
-      def pre(stage, *commands)
-        @pre[stage] ||= []
-        @pre[stage] += commands
-      end
-
-      def post(stage, *commands)
-        @post[stage] ||= []
-        @post[stage] += commands
-      end
-
       protected
 
         def install_sequence
@@ -83,20 +72,14 @@ module Sprinkle
           dress @options[:custom_install], :install
         end
 
-      private
-
-        def pre_commands(stage)
-          dress @pre[stage] || [], :pre
-        end
-
-        def post_commands(stage)
-          dress @post[stage] || [], :post
-        end
+      protected
 
         def dress(commands, stage)
           commands.collect { |command| "bash -c 'cd #{build_dir} && #{command} >> #{@package.name}-#{stage}.log 2>&1'" }
         end
 
+      private
+
         def create_options(key, prefix)
           @options[key].inject(' ') { |m, option| m << "#{prefix}-#{option} "; m }
         end

data/lib/sprinkle/package.rb

@@ -15,7 +15,7 @@ module Sprinkle
 
     class Package
       include ArbitraryOptions
-      attr_accessor :name, :provides, :installer, :dependencies
+      attr_accessor :name, :provides, :installer, :dependencies, :recommends
 
       def initialize(name, metadata = {}, &block)
         raise 'No package name supplied' unless name
@@ -23,6 +23,7 @@ module Sprinkle
         @name = name
         @provides = metadata[:provides]
         @dependencies = []
+        @recommends = []
         self.instance_eval &block
       end
 
@@ -35,12 +36,12 @@ module Sprinkle
       end
 
       def gem(name, options = {}, &block)
-        @dependencies << :rubygems
+        @recommends << :rubygems
         @installer = Sprinkle::Installers::Gem.new(self, name, options, &block)
       end
 
       def source(source, options = {}, &block)
-        @dependencies << :build_essential # REVISIT: should only be for Ubuntu/Debian, need platform specific bits here
+        @recommends << :build_essential # Ubuntu/Debian
         @installer = Sprinkle::Installers::Source.new(self, source, options, &block)
       end
 
@@ -56,11 +57,24 @@ module Sprinkle
         @dependencies.flatten!
       end
 
+      def recommends(*packages)
+        @recommends << packages
+        @recommends.flatten!
+      end
+
       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)
+        end
+
         @dependencies.each do |dep|
           package = PACKAGES[dep]
+          raise "Package definition not found for key: #{dep}" unless package
           block.call(self, package, depth) if block
           packages << package.tree(depth + 1, &block)
         end

data/lib/sprinkle/version.rb

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

data/spec/sprinkle/installers/apt_spec.rb

@@ -27,16 +27,23 @@ describe Sprinkle::Installers::Apt do
   describe 'during installation' do
 
     before do
-      @installer = create_apt 'ruby'
-      @install_sequence = @installer.send :install_sequence
+      @installer = create_apt 'ruby' do
+        pre :install, 'op1'
+        post :install, 'op2'
+      end
+      @install_commands = @installer.send :install_commands
     end
 
     it 'should invoke the apt installer for all specified packages' do
-      @install_sequence.should =~ /apt-get -qyu install ruby/
+      @install_commands.should =~ /apt-get -qyu install ruby/
     end
 
     it 'should specify a non interactive mode to the apt installer' do
-      @install_sequence.should =~ /DEBIAN_FRONTEND=noninteractive/
+      @install_commands.should =~ /DEBIAN_FRONTEND=noninteractive/
+    end
+
+    it 'should automatically insert pre/post commands for the specified package' do
+      @installer.send(:install_sequence).should == [ 'op1', %(DEBCONF_TERSE='yes' DEBIAN_PRIORITY='critical' DEBIAN_FRONTEND=noninteractive apt-get -qyu install ruby), 'op2' ]
     end
 
     it 'should install a specific version if defined'

data/spec/sprinkle/installers/gem_spec.rb

@@ -5,11 +5,11 @@ describe Sprinkle::Installers::Gem do
   before do
     @gem = 'rails'
     @version = '2.0.2'
-    @options = { :source => 'http://gems.github.com/' }
+    @options = { :source => 'http://gems.github.com/', :repository => '/tmp/gems' }
   end
 
   def create_gem(gem, version = nil, options = {}, &block)
-    @package = mock(Sprinkle::Package, :name => gem, :version => version, :source => nil)
+    @package = mock(Sprinkle::Package, :name => gem, :version => version, :source => nil, :repository => nil)
     Sprinkle::Installers::Gem.new(@package, gem, options, &block)
   end
 
@@ -31,6 +31,10 @@ describe Sprinkle::Installers::Gem do
       @installer.source.should == 'http://gems.github.com/'
     end
 
+    it 'should optionally store the repository location where gems are to be installed' do
+      @installer.repository.should == @options[:repository]
+    end
+
   end
 
   describe 'during installation' do
@@ -38,11 +42,18 @@ describe Sprinkle::Installers::Gem do
     describe 'without a version' do
 
       before do
-        @installer = create_gem @gem
+        @installer = create_gem @gem do
+          pre :install, 'op1'
+          post :install, 'op2'
+        end
+      end
+
+      it 'should invoke the gem installer for the specified package' do
+        @installer.send(:install_commands).should == "gem install #{@gem}"
       end
 
-      it 'should invoke the gem installer for all specified package' do
-        @installer.send(:install_sequence).should == "gem install #{@gem}"
+      it 'should automatically insert pre/post commands for the specified package' do
+        @installer.send(:install_sequence).should == [ 'op1', "gem install #{@gem}", 'op2' ]
       end
 
     end
@@ -54,7 +65,7 @@ describe Sprinkle::Installers::Gem do
       end
 
       it 'should install a specific version if defined' do
-        @installer.send(:install_sequence).should == "gem install #{@gem} --version '#{@version}'"
+        @installer.send(:install_commands).should == "gem install #{@gem} --version '#{@version}'"
       end
 
     end

data/spec/sprinkle/installers/installer_spec.rb

@@ -86,7 +86,7 @@ describe Sprinkle::Installers::Installer do
 
   end
 
-  describe Sprinkle::Installers::Installer, 'during installation' do
+  describe 'during installation' do
 
     it 'should request the install sequence from the concrete class' do
       @installer.should_receive(:install_sequence).and_return(@sequence)

data/spec/sprinkle/installers/rpm_spec.rb

@@ -27,12 +27,19 @@ describe Sprinkle::Installers::Rpm do
   describe 'during installation' do
 
     before do
-      @installer = create_rpm 'ruby'
-      @install_sequence = @installer.send :install_sequence
+      @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 =~ /rpm -Uvh ruby/
     end
 
-    it 'should invoke the apt installer for all specified packages' do
-      @install_sequence.should =~ /rpm -Uvh ruby/
+    it 'should automatically insert pre/post commands for the specified package' do
+      @installer.send(:install_sequence).should == [ 'op1', 'rpm -Uvh ruby', 'op2' ]
     end
 
     it 'should specify a non interactive mode to the apt installer'

data/spec/sprinkle/package_spec.rb

@@ -9,7 +9,7 @@ describe Sprinkle::Package do
     @opts = { }
   end
 
-  describe Sprinkle::Package, 'when created' do
+  describe 'when created' do
 
     it 'should be invalid without a block descriptor' do
       lambda { package @name }.should raise_error
@@ -48,6 +48,13 @@ describe Sprinkle::Package do
       pkg.dependencies.should == [:webserver, :database]
     end
 
+    it 'should optionally accept recommended dependencies' do
+      pkg = package @name do
+        recommends :webserver, :database
+      end
+      pkg.recommends.should == [:webserver, :database]
+    end
+
     it 'should optionally define a virtual package implementation' do
       pkg = package @name, :provides => :database do; end
       pkg.provides.should == :database
@@ -60,7 +67,7 @@ describe Sprinkle::Package do
 
   end
 
-  describe Sprinkle::Package, 'helper method' do
+  describe 'helper method' do
 
     it 'should added new packages to the global package hash' do
       pkg = package @name do; end
@@ -74,7 +81,7 @@ describe Sprinkle::Package do
 
   end
 
-  describe Sprinkle::Package, 'installer configuration' do
+  describe 'installer configuration' do
 
     it 'should optionally accept an apt installer' do
       pkg = package @name do
@@ -110,7 +117,7 @@ describe Sprinkle::Package do
 
   end
 
-  describe Sprinkle::Package, 'with a source installer' do
+  describe 'with a source installer' do
 
     it 'should optionally accept a block containing customisations' do
       pkg = package @name do
@@ -120,27 +127,27 @@ describe Sprinkle::Package do
       pkg.installer.class.should == Sprinkle::Installers::Source
     end
 
-    it 'should automatically add a build essential dependency' do
+    it 'should automatically add a build essential recommendation' do
       pkg = package @name do
         source 'archive'
       end
-      pkg.dependencies.should include(:build_essential)
+      pkg.recommends.should include(:build_essential)
     end
 
   end
 
-  describe Sprinkle::Package, 'with an gem installer' do
+  describe 'with an gem installer' do
 
-    it 'should automatically add a rubygems dependency' do
+    it 'should automatically add a rubygems recommendation' do
       pkg = package @name do
         gem 'gem'
       end
-      pkg.dependencies.should include(:rubygems)
+      pkg.recommends.should include(:rubygems)
     end
 
   end
 
-  describe Sprinkle::Package, 'when processing' do
+  describe 'when processing' do
 
     before do
       @deployment = mock(Sprinkle::Deployment)
@@ -149,7 +156,7 @@ describe Sprinkle::Package do
       @package = package @name do; end
     end
 
-    describe Sprinkle::Package, 'with an installer' do
+    describe 'with an installer' do
 
       before do
         @package.installer = @installer
@@ -168,7 +175,7 @@ describe Sprinkle::Package do
       end
     end
 
-    describe Sprinkle::Package, 'without an installer' do
+    describe 'without an installer' do
 
       it 'should not request the installer to process if the package is a metapackage' do
         @installer.should_not_receive(:process)
@@ -179,18 +186,32 @@ describe Sprinkle::Package do
 
   end
 
-  describe Sprinkle::Package, 'hierarchies' do
+  describe 'hierarchies' do
 
     before do
       @a = package :a do; requires :b; end
       @b = package :b do; requires :c; end
-      @c = package :c do; end
+      @c = package :c do; recommends :d; end
+      @d = package :d do; end
     end
 
     it 'should be able to return a dependency hierarchy tree' do
-      @a.tree.flatten.should == [ @c, @b, @a ]
-      @b.tree.flatten.should == [ @c, @b ]
-      @c.tree.flatten.should == [ @c ]
+      @a.tree.flatten.should == [ @d, @c, @b, @a ]
+      @b.tree.flatten.should == [ @d, @c, @b ]
+      @c.tree.flatten.should == [ @d, @c ]
+      @d.tree.flatten.should == [ @d ]
+    end
+
+    describe 'with missing recommendations' do
+
+      before do
+        @d.recommends :e
+      end
+
+      it 'should ignore missing recommendations' do
+        @d.tree.flatten.should == [ @d ]
+      end
+
     end
 
     it 'should optionally accept a block to call upon item in the tree during hierarchy traversal' do
@@ -198,7 +219,7 @@ describe Sprinkle::Package do
       @a.tree do
         @count += 1
       end
-      @count.should == 2
+      @count.should == 3
     end
 
     it 'should maintain a depth count of how deep the hierarchy is' do
@@ -208,4 +229,19 @@ describe Sprinkle::Package do
 
   end
 
+  describe 'with missing dependencies' do
+
+    before do
+      @pkg = package @name do
+        gem 'gem'
+        requires :missing
+      end
+    end
+
+    it 'should raise an error if a package is missing' do
+      lambda { @pkg.tree }.should raise_error
+    end
+
+  end
+
 end

data/sprinkle.gemspec

@@ -1,27 +1,43 @@
 Gem::Specification.new do |s|
   s.name = %q{sprinkle}
-  s.version = "0.1.2"
-
-  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcus Crafter"]
-  s.date = %q{2008-06-03}
+  s.date = %q{2008-07-13}
   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/deploy.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", "thoughts.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.has_rdoc = true
   s.homepage = %q{http://sprinkle.rubyforge.org}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{sprinkle}
-  s.rubygems_version = %q{1.1.1}
+  s.rubygems_version = %q{1.2.0}
   s.summary = %q{Ruby DSL based software provisioning tool}
 
-  s.add_dependency(%q<activesupport>, [">= 2.0.2"])
-  s.add_dependency(%q<highline>, [">= 1.4.0"])
-  s.add_dependency(%q<capistrano>, [">= 2.2.0"])
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if current_version >= 3 then
+      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"])
+    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"])
+    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"])
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: crafterm-sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-03 00:00:00 -07:00
+date: 2008-07-13 00:00:00 -07:00
 default_executable: sprinkle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.2.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
+    version: 
 description: Ruby DSL based software provisioning tool
 email: 
 - crafterm@redartisan.com
@@ -69,7 +78,6 @@ files:
 - examples/rails/packages/search.rb
 - examples/rails/packages/server.rb
 - examples/rails/rails.rb
-- examples/sprinkle/deploy.rb
 - examples/sprinkle/sprinkle.rb
 - lib/sprinkle.rb
 - lib/sprinkle/actors/capistrano.rb
@@ -112,7 +120,6 @@ files:
 - tasks/deployment.rake
 - tasks/environment.rake
 - tasks/rspec.rake
-- thoughts.txt
 has_rdoc: true
 homepage: http://sprinkle.rubyforge.org
 post_install_message: 
@@ -136,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sprinkle
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Ruby DSL based software provisioning tool