sprinkle 0.2.3 → 0.2.4

data/CREDITS

@@ -1,7 +1,7 @@
 = CREDITS
 
 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:
+and/or generally provided support to Sprinkle, I really appreciate your help:
 
 Kristin Baumann        (http://crafterm.net/kristin/blog/)
 Ben Schwarz            (http://germanforblack.com/)
@@ -24,3 +24,6 @@ Jacob Harris           (http://open.nytimes.com)
 Justin Pease           (http://jit.nuance9.com)
 Tobias Lütke           (http://blog.leetsoft.com)
 Josh Reynolds          (http://github.com/jreynolds)
+Jan Ulbrich            (http://www.ulbrich.net)
+
+The transfer installer contains a piece of exception reporting code copied from the Chef library (http://wiki.opscode.com/display/chef/Home)

data/Manifest.txt

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

data/{README.txt → README.markdown}

@@ -1,12 +1,12 @@
-= SPRINKLE
+# SPRINKLE
 
-http://redartisan.com/2008/5/27/sprinkle-intro
-http://github.com/crafterm/sprinkle
-http://github.com/benschwarz/passenger-stack
-http://www.vimeo.com/2888665
-http://redartisan.lighthouseapp.com/projects/25275-sprinkle/tickets
+* <http://redartisan.com/2008/5/27/sprinkle-intro>
+* <http://github.com/crafterm/sprinkle>
+* <http://github.com/benschwarz/passenger-stack>
+* <http://www.vimeo.com/2888665>
+* <http://redartisan.lighthouseapp.com/projects/25275-sprinkle/tickets>
 
-== DESCRIPTION:
+## DESCRIPTION:
 
 Sprinkle is a software provisioning tool you can use to build remote servers with, after the base operating
 system has been installed. For example, to install a Rails or Merb stack on a brand new slice directly after
@@ -208,18 +208,18 @@ and Git (via source with dependencies from APT):
 
     end
 
-Please see the examples directory for more complete examples of Sprinkle deployment scripts, and also the Passenger Stack github page and video by Ben Schwarz (http://github.com/benschwarz/passenger-stack and http://www.vimeo.com/2888665 respectively).
+Please see the examples directory for more complete examples of Sprinkle deployment scripts, and also the Passenger Stack github page and video by Ben Schwarz (<http://github.com/benschwarz/passenger-stack> and <http://www.vimeo.com/2888665> respectively).
 
 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.
 
 Marcus Crafter <crafterm@redartisan.com>
 
-== LICENSE:
+## LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2008 Marcus Crafter <crafterm@redartisan.com>
+Copyright (c) 2008-2009 Marcus Crafter <crafterm@redartisan.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/examples/rails/packages/rails.rb

@@ -3,7 +3,8 @@
 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
+  patchlevel '369'
+  source "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-#{version}-p#{patchlevel}.tar.gz" # implicit :style => :gnu
   requires :ruby_dependencies
 end
 
@@ -14,8 +15,8 @@ end
 
 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
+  version '1.3.5'
+  source "http://rubyforge.org/frs/download.php/60718/rubygems-#{version}.tgz" do
     custom_install 'ruby setup.rb'
   end
   requires :ruby
@@ -24,5 +25,5 @@ end
 package :rails do
   description 'Ruby on Rails'
   gem 'rails'
-  version '2.1.0'
+  version '2.3.3'
 end

data/examples/rails/packages/scm.rb

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

data/examples/rails/packages/search.rb

@@ -1,6 +1,6 @@
 package :sphinx, :provides => :search do
   description 'MySQL full text search engine'
-  version '0.9.8-rc2'
+  version '0.9.8.1'
   source "http://www.sphinxsearch.com/downloads/sphinx-#{version}.tar.gz"
   requires :mysql_dev
 end

data/examples/rails/packages/server.rb

@@ -1,7 +1,7 @@
 package :mongrel do
   description 'Mongrel Application Server'
   gem 'mongrel'
-  version '1.1.4'
+  version '1.1.5'
 end
 
 package :mongrel_cluster, :provides => :appserver do
@@ -13,7 +13,7 @@ end
 
 package :apache, :provides => :webserver do
   description 'Apache 2 HTTP Server'
-  version '2.2.9'
+  version '2.2.11'
   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}"

data/examples/rails/rails.rb

@@ -35,7 +35,7 @@ require 'packages/scm'
 #   the user is requested to select which one to use.
 
 policy :rails, :roles => :app do
-  requires :rails, :version => '2.1.0'
+  requires :rails, :version => '2.3.3'
   requires :appserver
   requires :database
   requires :webserver

data/lib/sprinkle/installers/apt.rb

@@ -44,7 +44,7 @@ module Sprinkle
 
         def install_commands #:nodoc:
           command = @options[:dependencies_only] ? 'build-dep' : 'install'
-          "DEBCONF_TERSE='yes' DEBIAN_PRIORITY='critical' DEBIAN_FRONTEND=noninteractive apt-get -qyu #{command} #{@packages.join(' ')}"
+          "env DEBCONF_TERSE='yes' DEBIAN_PRIORITY='critical' DEBIAN_FRONTEND=noninteractive apt-get --force-yes -qyu #{command} #{@packages.join(' ')}"
         end
 
     end

data/lib/sprinkle/installers/transfer.rb

@@ -45,7 +45,7 @@ end
 
 module Sprinkle
   module Installers
-    # Beware, strange "installer" coming your way.
+    # Beware, another strange "installer" coming your way.
     #
     # = File transfer installer
     #
@@ -73,6 +73,11 @@ module Sprinkle
 		# If you pass the option :render => true, this tells transfer that the source file
 		# is an ERB template to be rendered locally before being transferred (you can declare
 		# variables in the package scope). When render is true, recursive is turned off.
+		#   
+		#   package :nginx_conf do
+		#     nginx_port = 8080
+		#     transfer 'files/nginx.conf', '/etc/nginx.conf', :render => true
+		#   end
 		#
 		# Finally, should you need to run commands before or after the file transfer (making
 		# directories or changing permissions), you can use the pre/post :install directives

data/lib/sprinkle/package.rb

@@ -116,6 +116,7 @@ module Sprinkle
         @provides = metadata[:provides]
         @dependencies = []
         @recommends = []
+        @optional = []
         @verifications = []
         self.instance_eval &block
       end
@@ -233,12 +234,17 @@ module Sprinkle
         @recommends.flatten!
       end
 
+      def optional(*packages)
+        @optional << packages
+        @optional.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
+          next unless package # skip missing recommended packages as they're allowed to not exist
           block.call(self, package, depth) if block
           packages << package.tree(depth + 1, &block)
         end
@@ -253,6 +259,15 @@ module Sprinkle
         end
 
         packages << self
+
+        @optional.each do |dep|
+          package = PACKAGES[dep]
+          next unless package # skip missing optional packages as they're allow to not exist
+          block.call(self, package, depth) if block
+          packages << package.tree(depth + 1, &block)
+        end
+
+        packages
       end
 
       def to_s; @name; end

data/lib/sprinkle/verifiers/executable.rb

@@ -31,6 +31,23 @@ module Sprinkle
           @commands << "[ -n \"`echo \\`which #{path}\\``\" ]"
         end
       end
+
+      # Same as has_executable but with checking for e certain version number.
+      # Last option is the parameter to append for getting the version (which
+      # defaults to "-v").
+      def has_executable_with_version(path, version, get_version = '-v')
+        if path.include?('/')
+          @commands << "[ -x #{path} -a -n \"`#{path} #{get_version} 2> /dev/null | egrep -e \\\"#{version}\\\"`\" ]"
+        else
+          @commands << "[ -n \"`echo \\`which #{path}\\``\" -a -n \"`\\`which #{path}\\` #{get_version} 2>&1 | egrep -e \\\"#{version}\\\"`\" ]"
+        end
+      end
+
+      # Same as has_executable but checking output of a certain command
+      # with grep.
+      def has_version_in_grep(cmd, version)
+        @commands << "[ -n \"`#{cmd} 2> /dev/null | egrep -e \\\"#{version}\\\"`\" ]"
+      end
     end
   end
 end

data/lib/sprinkle/version.rb

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

data/spec/sprinkle/installers/apt_spec.rb

@@ -40,15 +40,15 @@ describe Sprinkle::Installers::Apt do
     end
 
     it 'should invoke the apt installer for all specified packages' do
-      @install_commands.should =~ /apt-get -qyu install ruby/
+      @install_commands.should =~ /apt-get --force-yes -qyu install ruby/
     end
 
     it 'should specify a non interactive mode to the apt installer' do
-      @install_commands.should =~ /DEBIAN_FRONTEND=noninteractive/
+      @install_commands.should =~ /env DEBCONF_TERSE='yes' DEBIAN_PRIORITY='critical' 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' ]
+      @installer.send(:install_sequence).should == [ 'op1', %(env DEBCONF_TERSE='yes' DEBIAN_PRIORITY='critical' DEBIAN_FRONTEND=noninteractive apt-get --force-yes -qyu install ruby), 'op2' ]
     end
 
     it 'should install a specific version if defined'
@@ -63,7 +63,7 @@ describe Sprinkle::Installers::Apt do
     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/
+      @install_commands.should =~ /apt-get --force-yes -qyu build-dep ruby/
     end
     
   end

data/spec/sprinkle/package_spec.rb

@@ -83,6 +83,13 @@ CODE
       pkg.recommends.should == [:webserver, :database]
     end
 
+    it 'should optionally accept optional dependencies' do
+      pkg = package @name do
+        optional :webserver_configuration, :database_configuration
+      end
+      pkg.optional.should == [:webserver_configuration, :database_configuration]
+    end
+
     it 'should optionally define a virtual package implementation' do
       pkg = package @name, :provides => :database do; end
       pkg.provides.should == :database
@@ -338,6 +345,7 @@ CODE
       @b = package :b do; requires :c; end
       @c = package :c do; recommends :d; end
       @d = package :d do; end
+      @e = package :e do; optional :d; end
     end
 
     it 'should be able to return a dependency hierarchy tree' do
@@ -345,12 +353,25 @@ CODE
       @b.tree.flatten.should == [ @d, @c, @b ]
       @c.tree.flatten.should == [ @d, @c ]
       @d.tree.flatten.should == [ @d ]
+      @e.tree.flatten.should == [ @e, @d ]
     end
 
     describe 'with missing recommendations' do
 
       before do
-        @d.recommends :e
+        @d.recommends :z
+      end
+
+      it 'should ignore missing recommendations' do
+        @d.tree.flatten.should == [ @d ]
+      end
+
+    end
+
+    describe 'with missing optional packages' do
+
+      before do
+        @d.optional :z
       end
 
       it 'should ignore missing recommendations' do

data/sprinkle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{sprinkle}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcus Crafter", "Mitchell Hashimoto"]
@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   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",
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.markdown"]
+  s.files = ["CREDITS", "History.txt", "MIT-LICENSE", "Manifest.txt", "README.markdown", "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",
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
                   "spec/sprinkle/script_spec.rb", "spec/sprinkle/sprinkle_spec.rb", "spec/sprinkle/installers/rake_spec.rb", "spec/sprinkle/verify_spec.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://sprinkle.rubyforge.org}
-  s.rdoc_options = ["--main", "README.txt"]
+  s.rdoc_options = ["--main", "README.markdown"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{sprinkle}
   s.rubygems_version = %q{1.3.0}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-24 00:00:00 +10:00
+date: 2009-07-25 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,13 +62,12 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- README.txt
 files: 
 - CREDITS
 - History.txt
 - MIT-LICENSE
 - Manifest.txt
-- README.txt
+- README.markdown
 - Rakefile
 - bin/sprinkle
 - config/hoe.rb