trevorturk-sprinkle 0.2.2 → 0.2.6

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/)
@@ -20,3 +20,10 @@ Joshua Sierles         (http://diluvia.net)
 Julian Russell         (http://github.com/plusplus)
 Dave (Gassto)          (http://github.com/gassto)
 Bodaniel Jeanes        (http://bjeanes.github.com)
+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
@@ -42,20 +42,26 @@ lib/sprinkle/extensions/dsl_accessor.rb
 lib/sprinkle/extensions/string.rb
 lib/sprinkle/extensions/symbol.rb
 lib/sprinkle/installers/apt.rb
+lib/sprinkle/installers/noop.rb
 lib/sprinkle/installers/bsd_port.rb
 lib/sprinkle/installers/deb.rb
 lib/sprinkle/installers/freebsd_pkg.rb
 lib/sprinkle/installers/gem.rb
 lib/sprinkle/installers/installer.rb
 lib/sprinkle/installers/mac_port.rb
-lib/sprinkle/installers/noop.rb
 lib/sprinkle/installers/openbsd_pkg.rb
 lib/sprinkle/installers/opensolaris_pkg.rb
 lib/sprinkle/installers/push_text.rb
 lib/sprinkle/installers/rake.rb
 lib/sprinkle/installers/rpm.rb
 lib/sprinkle/installers/source.rb
+lib/sprinkle/installers/transfer.rb
 lib/sprinkle/installers/yum.rb
+lib/sprinkle/installers/freebsd_pkg.rb
+lib/sprinkle/installers/openbsd_pkg.rb
+lib/sprinkle/installers/opensolaris_pkg.rb
+lib/sprinkle/installers/bsd_port.rb
+lib/sprinkle/installers/mac_port.rb
 lib/sprinkle/package.rb
 lib/sprinkle/policy.rb
 lib/sprinkle/script.rb
@@ -90,6 +96,10 @@ spec/sprinkle/installers/rake_spec.rb
 spec/sprinkle/installers/rpm_spec.rb
 spec/sprinkle/installers/source_spec.rb
 spec/sprinkle/installers/yum_spec.rb
+spec/sprinkle/installers/openbsd_pkg_spec.rb
+spec/sprinkle/installers/freebsd_pkg_spec.rb
+spec/sprinkle/installers/bsd_port_spec.rb
+spec/sprinkle/installers/mac_port_spec.rb
 spec/sprinkle/package_spec.rb
 spec/sprinkle/policy_spec.rb
 spec/sprinkle/script_spec.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/bin/sprinkle

@@ -73,7 +73,7 @@ def log_level(options)
   Object.logger.level = ActiveSupport::BufferedLogger::Severity::DEBUG if options[:verbose]
 end
 
-require 'sprinkle'
+require File.dirname(__FILE__) + '/../lib/sprinkle'
 
 powder = OPTIONS[:path]
 raise "Sprinkle script is not readable: #{powder}" unless File.readable?(powder)

data/config/hoe.rb

@@ -35,7 +35,7 @@ VERS = Sprinkle::VERSION::STRING + (REV ? ".#{REV}" : "")
 RDOC_OPTS = ['--quiet', '--title', 'sprinkle documentation',
     "--opname", "index.html",
     "--line-numbers", 
-    "--main", "README.txt",
+    "--main", "README.markdown",
     "--inline-source"]
 
 class Hoe

data/examples/rails/README

@@ -1,4 +1,4 @@
-= Example Rails Spinkle Deployment Script
+= Example Rails Sprinkle Deployment Script
 
 The following example shows how you can provision Rails and associated packages onto a remote server (or set of servers).
 
@@ -12,4 +12,4 @@ $> sprinkle -t -s rails.rb
 
 == Information
 
-For more information, please see: http://github.com/crafterm/sprinkle/tree/master/README.txt
+For more information, please see: http://github.com/crafterm/sprinkle/tree/master/README.markdown

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/actors/capistrano.rb

@@ -76,6 +76,22 @@ module Sprinkle
         end
       end
 
+			def transfer(name, source, destination, roles, recursive = true, suppress_and_return_failures = false)
+        define_task(name, roles) do
+          upload source, destination, :via => :scp, :recursive => recursive
+        end
+        
+        begin
+          run(name)
+          return true
+        rescue ::Capistrano::CommandError => e
+          return false if suppress_and_return_failures
+          
+          # Reraise error if we're not suppressing it
+          raise
+        end
+			end
+			
       private
 
         # REVISIT: can we set the description somehow?

data/lib/sprinkle/actors/local.rb

@@ -25,6 +25,13 @@ module Sprinkle
         return true
       end
       
+			def transfer(name, source, destination, roles, recursive = true, suppress_and_return_failures = false)
+				if recursive
+					flags = "-R "
+				end
+				
+				system "cp #{flags}#{source} #{destination}"
+			end
     end
   end
 end

data/lib/sprinkle/actors/ssh.rb

@@ -1,4 +1,5 @@
 require 'net/ssh/gateway'
+require 'net/scp'
 
 module Sprinkle
   module Actors
@@ -26,7 +27,12 @@ module Sprinkle
         return process_with_gateway(name, commands, roles) if gateway_defined?
         process_direct(name, commands, roles)
       end
-      
+
+      def transfer(name, source, destination, roles, recursive = true, suppress_and_return_failures = false)
+        return transfer_with_gateway(name, source, destination, roles, recursive) if gateway_defined?
+        transfer_direct(name, source, destination, roles, recursive)
+      end
+			
       protected
       
         def process_with_gateway(name, commands, roles)
@@ -39,10 +45,25 @@ module Sprinkle
           Array(roles).each { |role| execute_on_role(commands, role) }
         end
         
+        def transfer_with_gateway(name, source, destination, roles, recursive)
+          on_gateway do |gateway|
+            Array(roles).each { |role| transfer_to_role(source, destination, role, recursive, gateway) }
+          end
+        end
+        
+        def transfer_direct(name, source, destination, roles, recursive)
+          Array(roles).each { |role| transfer_to_role(source, destination, role, recursive) }
+        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 transfer_to_role(source, destination, role, gateway = nil)
+          hosts = @options[:roles][role]
+          Array(hosts).each { |host| transfer_to_host(source, destination, host, gateway) }
+        end
         
         def execute_on_host(commands, host, gateway = nil)
           if gateway # SSH connection via gateway
@@ -64,6 +85,23 @@ module Sprinkle
           end
         end
 
+        def transfer_to_host(source, destination, host, recursive, gateway = nil)
+          if gateway # SSH connection via gateway
+            gateway.ssh(host, @options[:user]) do |ssh|
+              transfer_on_connection(source, destination, recursive, ssh)
+            end
+          else # direct SSH connection
+            Net::SSH.start(host, @options[:user]) do |ssh|
+              transfer_on_connection(source, destination, recursive, ssh)
+            end
+          end
+        end
+        
+        def transfer_on_connection(source, destination, recursive, connection)
+					scp = Net::SCP.new(connection)
+					scp.upload! source, destination, :recursive => recursive
+        end
+
       private
       
         def gateway_defined?

data/lib/sprinkle/actors/vlad.rb

@@ -50,6 +50,19 @@ module Sprinkle
         rescue ::Vlad::CommandFailedError => e
           return false if suppress_and_return_failures
           
+          # Reraise error if we're not suppressing it
+          raise
+        end
+      end
+
+			# Sorry, all transfers are recursive
+      def transfer(name, source, destination, roles, recursive = true, suppress_and_return_failures = false) #:nodoc:
+        begin
+					rsync source, destination
+          return true
+        rescue ::Vlad::CommandFailedError => e
+          return false if suppress_and_return_failures
+          
           # Reraise error if we're not suppressing it
           raise
         end

data/lib/sprinkle/deployment.rb

@@ -52,7 +52,7 @@ module Sprinkle
       # the actor. For more information on what configuration options are
       # available, view the corresponding Sprinkle::Actors page.
       def delivery(type, &block) #:doc:
-        @style = Actors.const_get(type.to_s.titleize).new &block
+        @style = ("Sprinkle::Actors::" + type.to_s.titleize).constantize.new &block
       end
 
       def method_missing(sym, *args, &block) #:nodoc:

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/gem.rb

@@ -54,6 +54,7 @@ module Sprinkle
           cmd << " --source #{source}" if source
           cmd << " --install-dir #{repository}" if option?(:repository)
           cmd << " --no-rdoc --no-ri" unless option?(:build_docs)
+          cmd << " --http-proxy #{http_proxy}" if option?(:http_proxy)
           cmd << " -- #{build_flags}" if option?(:build_flags)
           cmd
         end

data/lib/sprinkle/installers/noop.rb

@@ -5,14 +5,14 @@ module Sprinkle
     # This installer does nothing, it's simply useful for running pre / post hooks by themselves. 
     # 
     class Noop < Installer
-      def initialize(parent, &block) #:nodoc:
-        super parent, {}, &block
+      def initialize(parent, name, options = {}, &block) #:nodoc:
+        super parent, options, &block
       end
 
       protected
 
         def install_commands #:nodoc:
-          ''
+          'echo noop'
         end
 
     end

data/lib/sprinkle/installers/push_text.rb

@@ -37,7 +37,7 @@ module Sprinkle
       protected
 
         def install_commands #:nodoc:
-          "echo '#{@text}' |#{'sudo' if option?(:sudo)} tee -a #{@path}"
+          "echo -e '#{@text.gsub("'", "'\\\\''").gsub("\n", '\n')}' |#{'sudo ' if option?(:sudo)}tee -a #{@path}"
         end
 
     end

data/lib/sprinkle/installers/source.rb

@@ -46,16 +46,26 @@ module Sprinkle
     #   package :magic_beans do
     #     source 'http://magicbeansland.com/latest-1.1.1.tar.gz' do
     #       prefix    '/usr/local'
-    #       
+    #
     #       pre :prepare { 'echo "Here we go folks."' }
     #       post :extract { 'echo "I believe..."' }
     #       pre :build { 'echo "Cross your fingers!"' }
     #     end
     #   end
     #
+    # Fourth, specifying a custom archive name because the downloaded file name
+    # differs from the source URL:
+    #
+    #   package :gitosis do
+    #     source 'http://github.com/crafterm/sprinkle/tarball/master' do
+    #       custom_archive 'crafterm-sprinkle-518e33c835986c03ec7ae8ea88c657443b006f28.tar.gz'
+    #     end
+    #   end
+    #
     # As you can see, setting options is as simple as creating a
     # block and calling the option as a method with the value as 
     # its parameter.
+
     class Source < Installer
       attr_accessor :source #:nodoc:
 
@@ -143,7 +153,7 @@ module Sprinkle
         end
 
         def extract_command #:nodoc:
-          case @source
+          case archive_name
           when /(tar.gz)|(tgz)$/
             'tar xzf'
           when /(tar.bz2)|(tb2)$/
@@ -158,7 +168,7 @@ module Sprinkle
         end
 
         def archive_name #:nodoc:
-          name = @source.split('/').last
+          name = @options[:custom_archive] || @source.split('/').last
           raise "Unable to determine archive name for source: #{source}, please update code knowledge" unless name
           name
         end
@@ -168,12 +178,12 @@ module Sprinkle
         end
 
         def base_dir #:nodoc:
-          if @source.split('/').last =~ /(.*)\.(tar\.gz|tgz|tar\.bz2|tb2)/
+          if archive_name.split('/').last =~ /(.*)\.(tar\.gz|tgz|tar\.bz2|tar|tb2)/
             return $1
           end
           raise "Unknown base path for source archive: #{@source}, please update code knowledge"
         end
-        
+
     end
   end
 end

data/lib/sprinkle/package.rb

@@ -116,6 +116,7 @@ module Sprinkle
         @provides = metadata[:provides]
         @dependencies = []
         @recommends = []
+        @optional = []
         @verifications = []
         self.instance_eval &block
       end
@@ -177,7 +178,11 @@ module Sprinkle
       def push_text(text, path, options = {}, &block)
         @installer = Sprinkle::Installers::PushText.new(self, text, path, options, &block)
       end
-      
+
+			def transfer(source, destination, options = {}, &block)
+				@installer = Sprinkle::Installers::Transfer.new(self, source, destination, options, &block)
+      end
+
       def verify(description = '', &block)
         @verifications << Sprinkle::Verify.new(self, description, &block)
       end  
@@ -229,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
@@ -249,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  = 2
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/sprinkle/actors/capistrano_spec.rb

@@ -135,6 +135,51 @@ describe Sprinkle::Actors::Capistrano do
 
   end
 
+  describe 'transferring files' do
+
+    before do
+      @source = 'source'
+			@dest   = 'dest'
+      @roles    = %w( app )
+      @name     = 'name'
+
+      @cap = create_cap do; recipes 'deploy'; end
+      @cap.stub!(:run).and_return
+      
+      @testing_errors = false
+    end
+
+    it 'should dynamically create a capistrano task containing calling upload' do
+      @cap.config.should_receive(:task).and_return
+    end
+
+    it 'should invoke capistrano task after creation' do
+      @cap.should_receive(:run).with(@name).and_return
+    end
+    
+    it 'should raise capistrano errors when suppressing parameter is not set' do
+      @testing_errors = true
+      
+      @cap.should_receive(:run).and_raise(::Capistrano::CommandError)
+      lambda { @cap.process @name, @commands, @roles }.should raise_error(::Capistrano::CommandError)
+    end
+    
+    it 'should not raise errors and instead return false when suppressing parameter is set' do
+      @testing_errors = true
+      
+      @cap.should_receive(:run).and_raise(::Capistrano::CommandError)
+      
+      value = nil
+      lambda { value = @cap.process(@name, @commands, @roles, true) }.should_not raise_error(::Capistrano::CommandError)
+      
+      value.should_not be
+    end
+
+    after do
+      @cap.transfer @name, @source, @dest, @roles unless @testing_errors
+    end
+  end
+
   describe 'generated task' do
 
     before do
@@ -167,4 +212,54 @@ describe Sprinkle::Actors::Capistrano do
 
   end
 
+  describe 'generated transfer' do
+    before do
+      @source   = 'source'
+			@dest     = 'dest'
+      @roles    = %w( app )
+      @name     = 'name'
+
+      @cap = create_cap do; recipes 'deploy'; end
+      @cap.config.stub!(:upload).and_return
+    end
+
+    it 'should call upload with the source and destination via :scp' do
+      @cap.config.should_receive(:upload).with(@source, @dest, :via => :scp, :recursive => true).and_return
+    end
+
+    it 'should be applicable for the supplied roles' do
+      @cap.stub!(:run).and_return
+      @cap.config.should_receive(:task).with(:install_name, :roles => @roles).and_return
+    end
+
+    after do
+      @cap.transfer @name, @source, @dest, @roles
+    end
+  end
+
+  describe 'generated transfer when recursive is false' do
+    before do
+      @source   = 'source'
+			@dest     = 'dest'
+      @roles    = %w( app )
+      @name     = 'name'
+
+      @cap = create_cap do; recipes 'deploy'; end
+      @cap.config.stub!(:upload).and_return
+    end
+
+    it 'should call upload with the source and destination via :scp' do
+      @cap.config.should_receive(:upload).with(@source, @dest, :via => :scp, :recursive => false).and_return
+    end
+
+    it 'should be applicable for the supplied roles' do
+      @cap.stub!(:run).and_return
+      @cap.config.should_receive(:task).with(:install_name, :roles => @roles).and_return
+    end
+
+    after do
+      @cap.transfer @name, @source, @dest, @roles, false
+    end
+  end
+
 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/installers/gem_spec.rb

@@ -5,7 +5,7 @@ describe Sprinkle::Installers::Gem do
   before do
     @gem = 'rails'
     @version = '2.0.2'
-    @options = { :source => 'http://gems.github.com/', :repository => '/tmp/gems', :build_flags => '--build_flag=foo' }
+    @options = { :source => 'http://gems.github.com/', :repository => '/tmp/gems', :build_flags => '--build_flag=foo', :http_proxy => 'http://proxy:8080' }
   end
 
   def create_gem(gem, version = nil, options = {}, &block)
@@ -39,6 +39,10 @@ describe Sprinkle::Installers::Gem do
       @installer.build_flags.should == @options[:build_flags]
     end
 
+    it 'should optionally store the http proxy' do
+      @installer.http_proxy.should == @options[:http_proxy]
+    end
+    
   end
 
   describe 'during installation' do
@@ -86,6 +90,18 @@ describe Sprinkle::Installers::Gem do
       
     end
     
+    describe 'with http proxy' do
+      
+      before do
+        @installer = create_gem @gem, nil, :http_proxy => 'http://proxy:8080'
+      end
+      
+      it 'should install with defined build flags' do
+        @installer.send(:install_commands).should == "gem install #{@gem} --no-rdoc --no-ri --http-proxy http://proxy:8080"
+      end
+      
+    end
+    
   end
 
 end

data/spec/sprinkle/installers/push_text_spec.rb

@@ -32,23 +32,34 @@ describe Sprinkle::Installers::PushText do
     end
 
     it 'should invoke the push text installer for all specified packages' do
-      @install_commands.should =~ /echo 'another-hair-brained-idea' | tee -a \/dev\/mind\/late-night/
+      @install_commands.should == %q[echo -e 'another-hair-brained-idea' |tee -a /dev/mind/late-night]
     end
 
     it 'should automatically insert pre/post commands for the specified package' do
-      @installer.send(:install_sequence).should == [ 'op1', "echo 'another-hair-brained-idea' | tee -a /dev/mind/late-night", 'op2' ]
+      @installer.send(:install_sequence).should == [ 'op1', "echo -e 'another-hair-brained-idea' |tee -a /dev/mind/late-night", 'op2' ]
     end
 
   end
   
   describe 'running with sudo' do
     before do
-      @installer = create_text "I'm a special user", "/dev/mind/the-day-after", :sudo => true
+      @installer = create_text "a special user", "/dev/mind/the-day-after", :sudo => true
       @install_commands = @installer.send :install_commands
     end
     
     it "should invoke the push installer with sudo" do
-      @install_commands.should =~ /echo 'I\'m a special user' | sudo tee -a \/dev\/mind\/the-day-after/
+      @install_commands.should == %q[echo -e 'a special user' |sudo tee -a /dev/mind/the-day-after]
+    end
+  end
+  
+  describe 'sending a string with single quotes' do
+    before do
+      @installer = create_text "I'm a string with a single quote", "/dev/mind/the-day-after"
+      @install_commands = @installer.send :install_commands
+    end
+    
+    it "should correctly encode the single quote character" do
+      @install_commands.should == %q[echo -e 'I'\''m a string with a single quote' |tee -a /dev/mind/the-day-after]
     end
   end
 

data/spec/sprinkle/installers/source_spec.rb

@@ -161,6 +161,20 @@ describe Sprinkle::Installers::Source do
       )
     end
 
+    describe 'with a custom archive definition' do
+      before do
+        @installer.options[:custom_archive] = 'super-foo.tar'
+      end
+
+      it 'should install the source from the custom archive' do
+        @installer.send(:extract_commands).first.should =~ /super-foo/
+        @installer.send(:configure_commands).first.should =~ /super-foo/
+        @installer.send(:build_commands).first.should =~ /super-foo/
+        @installer.send(:install_commands).first.should =~ /super-foo/
+      end
+
+    end
+
     describe 'during a customized install' do
 
       before do
@@ -174,7 +188,7 @@ describe Sprinkle::Installers::Source 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
@@ -190,25 +204,25 @@ describe Sprinkle::Installers::Source do
       it 'should install the source using a custom installation command' do
         @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/sprinkle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{sprinkle}
-  s.version = "0.2.2"
+  s.version = "0.2.6"
 
   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",
@@ -37,12 +37,12 @@ Gem::Specification.new do |s|
                   "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/installers/freebsd_pkg_spec.rb",
-                  "spec/sprinkle/installers/openbsd_pkg_spec.rb", "spec/sprinkle/installers/opensolaris_pkg_spec.rb", "spec/sprinkle/installers/noop_spec.rb",
+                  "spec/sprinkle/installers/openbsd_pkg_spec.rb", "spec/sprinkle/installers/opensolaris_pkg_spec.rb",
                   "spec/sprinkle/installers/mac_port_spec.rb", "spec/sprinkle/installers/push_text_spec.rb", "spec/sprinkle/installers/bsd_port_spec.rb", "spec/sprinkle/policy_spec.rb",
                   "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}

data/tasks/deployment.rake

@@ -21,6 +21,9 @@ task :check_version do
   end
 end
 
+task :clobber_rcov do
+end
+
 desc 'Install the package as a gem, without generating documentation(ri/rdoc)'
 task :install_gem_no_doc => [:clean, :package] do
   sh "#{'sudo ' unless Hoe::WINDOZE }gem install pkg/*.gem --no-rdoc --no-ri"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trevorturk-sprinkle
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.6
 platform: ruby
 authors: 
 - Marcus Crafter
@@ -64,13 +64,13 @@ extensions: []
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
-- README.txt
+- README.markdown
 files: 
 - CREDITS
 - History.txt
 - MIT-LICENSE
 - Manifest.txt
-- README.txt
+- README.markdown
 - Rakefile
 - bin/sprinkle
 - config/hoe.rb
@@ -143,10 +143,11 @@ files:
 - tasks/rspec.rake
 has_rdoc: true
 homepage: http://sprinkle.rubyforge.org
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.markdown
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -164,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sprinkle
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Ruby DSL based software provisioning tool
@@ -186,7 +187,6 @@ test_files:
 - spec/sprinkle/installers/freebsd_pkg_spec.rb
 - spec/sprinkle/installers/openbsd_pkg_spec.rb
 - spec/sprinkle/installers/opensolaris_pkg_spec.rb
-- spec/sprinkle/installers/noop_spec.rb
 - spec/sprinkle/installers/mac_port_spec.rb
 - spec/sprinkle/installers/push_text_spec.rb
 - spec/sprinkle/installers/bsd_port_spec.rb

data/spec/sprinkle/installers/noop_spec.rb

@@ -1,23 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe Sprinkle::Installers::Noop do
-
-  before do
-    @package = mock(Sprinkle::Package, :name => 'spec')
-  end
-
-  def create_noop(names, options = {}, &block)
-    Sprinkle::Installers::Noop.new(@package, &block)
-  end
-
-  describe 'during installation' do
-
-    it 'should always be empty' do
-      @installer = create_noop 'spec'
-      @install_commands = @installer.send :install_commands
-      @install_commands.should == ''
-    end
-
-  end
-
-end