sprinkle 0.7.2 → 0.7.3

data/.gitignore

@@ -5,4 +5,8 @@ pkg
 .*.swp
 coverage/*
 rdoc
-.ruby-version
+.ruby-version
+
+work
+config
+tmp

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sprinkle (0.7.1.1)
+    sprinkle (0.7.2)
       activesupport (>= 2.0.2)
       capistrano (>= 2.5.5)
       erubis (>= 2.7.0)

data/README.md

@@ -4,7 +4,7 @@ Sprinkle is a software provisioning tool you can use to build remote servers wit
 system has been installed. For example, to install a Rails or Merb stack on a brand new slice directly after
 its been created.
 
-[![Build Status](https://travis-ci.org/sprinkle-tool/sprinkle.png?branch=master)](https://travis-ci.org/sprinkle-tool/sprinkle)
+[![Build Status](https://travis-ci.org/sprinkle-tool/sprinkle.png?branch=master)](https://travis-ci.org/sprinkle-tool/sprinkle) [![Code Climate](https://codeclimate.com/github/sprinkle-tool/sprinkle.png)](https://codeclimate.com/github/sprinkle-tool/sprinkle/)
 
   * `#sprinkle` channel on the Freenode IRC Network
   * <http://redartisan.com/2008/5/27/sprinkle-intro>

data/lib/sprinkle/actors/ssh.rb

@@ -1,5 +1,6 @@
 require 'net/ssh/gateway'
 require 'net/scp'
+require File.dirname(__FILE__) + "/ssh/connection_cache"
 
 module Sprinkle
   module Actors
@@ -43,20 +44,10 @@ module Sprinkle
       class SSHCommandFailure < StandardError #:nodoc:
         attr_accessor :details
       end
-      
-      class SSHConnectionCache #:nodoc:
-        def initialize; @cache={}; end
-        def start(host, user, opts={})
-          key="#{host}#{user}#{opts.to_s}"
-          @cache[key] ||= Net::SSH.start(host,user,opts)
-        end
-      end
-      
-      
+            
       def initialize(options = {}, &block) #:nodoc:
         @options = options.update(:user => 'root')
         @roles = {}
-        @connection_cache = SSHConnectionCache.new
         self.instance_eval &block if block
         raise "You must define at least a single role." if @roles.empty?
       end
@@ -115,24 +106,17 @@ module Sprinkle
       def sudo_command #:nodoc:
         "sudo"
       end
-
-      def setup_gateway #:nodoc:
-        @gateway ||= Net::SSH::Gateway.new(@options[:gateway], @options[:user]) if @options[:gateway]
-      end
       
       def teardown #:nodoc:
-        @gateway.shutdown! if @gateway
+        connections.shutdown!
       end
       
-      def verify(verifier, roles, opts = {}) #:nodoc:
-        @verifier = verifier
+      def verify(verifier, roles) #:nodoc:
         # issue all the verification steps in a single SSH command
         commands=[verifier.commands.join(" && ")]
         process(verifier.package.name, commands, roles)
       rescue SSHCommandFailure => e
         false
-      ensure
-        @verifier = nil
       end
       
       def install(installer, roles, opts = {}) #:nodoc:
@@ -144,24 +128,20 @@ module Sprinkle
         @installer = nil
       end
 
-      protected
+      private
       
         def raise_error(e) #:nodoc:
           raise Sprinkle::Errors::RemoteCommandFailure.new(@installer, e.details, e)
         end
       
-        def process(name, commands, roles, opts = {}) #:nodoc:
-          setup_gateway
-          r=execute_on_role(commands, roles)
-          logger.debug green "process returning #{r}"
-          return r
+        def process(name, commands, roles) #:nodoc:
+          execute_on_role(commands, roles)
         end      
       
         def execute_on_role(commands, role) #:nodoc:
           hosts = @roles[role]
           Array(hosts).each do |host| 
             success = execute_on_host(commands, host)
-            return false unless success
           end
         end
         
@@ -174,33 +154,28 @@ module Sprinkle
         end
         
         def execute_on_host(commands,host) #:nodoc:
-          session = ssh_session(host)
-          @log_recorder = Sprinkle::Utility::LogRecorder.new
           prepare_commands(commands).each do |cmd|
-            if cmd == :TRANSFER
-              transfer_to_host(@installer.sourcepath, @installer.destination, session, 
-                :recursive => @installer.options[:recursive])
-              next
-            elsif cmd == :RECONNECT
-              session.close # disconnenct
-              session = ssh_session(host) # reconnect
-              next
-            end
-            @log_recorder.reset cmd
-            res = ssh(session, cmd)
-            if res != 0 
-              fail=SSHCommandFailure.new
-              fail.details = @log_recorder.hash.merge(:hosts => host)
-              raise fail
+            case cmd
+              when :RECONNECT
+                reconnect host
+              when :TRANSFER
+                transfer_to_host(@installer.sourcepath, @installer.destination, host, 
+                  :recursive => @installer.options[:recursive])
+              else  
+                run_command cmd, host
             end
           end
-          true
         end
         
-        def ssh(host, cmd, opts={}) #:nodoc:
-          session = host.is_a?(Net::SSH::Connection::Session) ? host : ssh_session(host)
+        def run_command(cmd,host) #:nodoc:
+          @log_recorder= Sprinkle::Utility::LogRecorder.new(cmd)
+          session = ssh_session(host)
           logger.debug "[#{session.host}] ssh: #{cmd}"
-          channel_runner(session, cmd)
+          if channel_runner(session, cmd) != 0 
+            fail=SSHCommandFailure.new
+            fail.details = @log_recorder.hash.merge(:hosts => host)
+            raise fail
+          end
         end
         
         def channel_runner(session, command) #:nodoc:
@@ -244,7 +219,7 @@ module Sprinkle
         
         def transfer_to_host(source, destination, host, opts={}) #:nodoc:
           logger.debug "upload: #{destination}"
-          session = host.is_a?(Net::SSH::Connection::Session) ? host : ssh_session(host)
+          session = ssh_session(host)
           scp = Net::SCP.new(session)
           scp.upload! source, destination, :recursive => opts[:recursive], :chunk_size => 32.kilobytes
         rescue RuntimeError => e
@@ -256,28 +231,32 @@ module Sprinkle
         end
         
         def ssh_session(host) #:nodoc:
-          if @gateway
-            gateway.ssh(host, @options[:user])
-          else
-            @connection_cache.start(host, @options[:user],:password => @options[:password], :keys => @options[:keys])
-          end
-        end        
+          connections.start(host, @options[:user], @options.slice(:password, :keys))
+        end       
+
+        def reconnect(host) #:nodoc:
+          connections.reconnect host
+        end
+        
+        def connections #:nodoc:
+          @connection_cache ||= SSHConnectionCache.new @options.slice(:gateway, :user)
+        end 
         
         private
-        def color(code, s)
-          "\033[%sm%s\033[0m"%[code,s]
+        def color(code, text)
+          "\033[%sm%s\033[0m"%[code,text]
         end
-        def red(s)
-          color(31, s)
+        def red(text)
+          color(31, text)
         end
-        def yellow(s)
-          color(33, s)
+        def yellow(text)
+          color(33, text)
         end
-        def green(s)
-          color(32, s)
+        def green(text)
+          color(32, text)
         end
-        def blue(s)
-          color(34, s)
+        def blue(text)
+          color(34, text)
         end
     end
   end

data/lib/sprinkle/actors/ssh/connection_cache.rb

@@ -0,0 +1,26 @@
+module Sprinkle
+  module Actors
+    class SSHConnectionCache #:nodoc:
+      def initialize(options={}) 
+        @cache = {}
+        @gateway = Net::SSH::Gateway.new(options[:gateway], options[:user]) if options[:gateway]
+      end
+      def start(host, user, opts={})
+        key="#{host}/#{user}#{opts.to_s}"
+        if @gateway
+          @cache[key] ||= @gateway.ssh(host, user, opts)
+        else
+          @cache[key] ||= Net::SSH.start(host, user, opts)
+        end
+      end
+      def reconnect(host)
+        @cache.delete_if do |k,v| 
+          (v.close; true) if k =~ /^#{host}\//
+        end
+      end
+      def shutdown!
+        @gateway.shutdown! if @gateway
+      end
+    end
+  end
+end

data/lib/sprinkle/extensions/sudo.rb

@@ -0,0 +1,13 @@
+module Sprinkle
+  module Sudo
+    
+    def sudo_cmd
+      return "#{@delivery.try(:sudo_command) || "sudo"} " if sudo?
+    end
+
+    def sudo?
+      options[:sudo] or package.sudo? or @delivery.try(:sudo?)
+    end
+    
+  end
+end

data/lib/sprinkle/installers/file.rb

@@ -21,61 +21,62 @@ module Sprinkle
     #
     # 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.
-    # 
+    #
     # == Rendering templates
     #
-    # Use the template render helper to render an ERB template to a remote file (you 
+    # Use the template render helper to render an ERB template to a remote file (you
     # can use variables in your templates by setting them as instance variables inside
     # your package.  Templates have access to package methods such as opts, args, etc.
     #
     #   package :nginx_conf do
     #     @nginx_port = 8080
-    #     file '/etc/nginx.conf', 
+    #     file '/etc/nginx.conf',
     #       :contents => render("nginx.conf")
-    #       # ./templates/nginx.conf.erb or 
+    #       # ./templates/nginx.conf.erb or
     #       # ./templates/nginx.conf should contain the erb template
     #   end
     class FileInstaller < Installer
       attr_reader :sourcepath, :destination, :contents #:nodoc:
-      
+
       api do
         def file(destination, options = {}, &block) #:nodoc:
           # options.merge!(:binding => binding())
           install FileInstaller.new(self, destination, options, &block)
         end
       end
-      
+
       def initialize(parent, destination, options={}, &block) #:nodoc:
         @destination = destination
         @contents = options[:content] || options[:contents]
         raise "need :contents key for file" unless @contents
         super parent, options, &block
-        
-        post_move_if_sudo
-        setup_source
+
         # setup file attributes
         owner options[:owner] if options[:owner]
         mode options[:mode] if options[:mode]
+
+        post_move_if_sudo
+        setup_source
       end
-      
+
       def install_commands #:nodoc:
         :TRANSFER
       end
-            
+
       # calls chown own to set the file ownership
       def owner(owner)
         @owner = owner
         post :install, "#{sudo_cmd}chown #{owner} #{@destination}"
       end
-      
+
       # calls chmod to set the files permissions
       def mode(mode)
         @mode = mode
         post :install, "#{sudo_cmd}chmod #{mode} #{@destination}"
       end
-      
+
       private
-      
+
       def post_move_if_sudo
         return unless sudo? # perform the file copy in two steps if we're using sudo
         final = @destination
@@ -84,14 +85,14 @@ module Sprinkle
         # a user may have requested
         post(:install).unshift ["#{sudo_cmd}mv #{@destination} #{final}"]
       end
-      
+
       def setup_source
         file=Tempfile.new(@package.name.to_s)
         file.print(@contents)
         file.close
         @sourcepath = file.path
       end
-      
+
     end
   end
 end

data/lib/sprinkle/installers/installer.rb

@@ -51,7 +51,8 @@ module Sprinkle
     # or post :install. If this is the case, it will be documented on
     # the installation method's corresponding documentation page. 
     class Installer
-      include Sprinkle::Attributes      
+      include Sprinkle::Attributes
+      include Sprinkle::Sudo
       
       delegate :version, :to => :package
       
@@ -84,14 +85,6 @@ module Sprinkle
         end
       end
             
-      def sudo_cmd
-        return "#{@delivery.try(:sudo_command) || "sudo"} " if sudo?
-      end
-
-      def sudo?
-        options[:sudo] or package.sudo? or @delivery.try(:sudo?)
-      end
-
       def escape_shell_arg(str)
         str.gsub("'", "'\\\\''").gsub("\n", '\n')
       end

data/lib/sprinkle/installers/runner.rb

@@ -15,33 +15,50 @@ module Sprinkle
     #     runner [ "make world", "destroy world" ]
     #   end
     #
+    # Environment variables can be supplied throught the :env option.
+    #
+    #   package :magic_beans do
+    #     runner "make world", :env => {
+    #       :PATH => '/this/is/my/path:$PATH'
+    #     }
+    #   end
+    #
     class Runner < Installer
-      
+
       api do
         def runner(*cmds, &block)
           options = cmds.extract_options!
           install Runner.new(self, cmds, options, &block)
         end
-        
+
         # runs 'echo noop' on the remote host
         def noop
           install Runner.new(self, "echo noop")
         end
       end
-      
+
       attr_accessor :cmds #:nodoc:
       def initialize(parent, cmds, options = {}, &block) #:nodoc:
         super parent, options, &block
+        @env = options.delete(:env)
         @cmds = [*cmds].flatten
         raise "you need to specify a command" if cmds.nil?
       end
-      
+
       protected
-        
+
+        def env_str #:nodoc:
+          @env_str ||= @env.inject("env ") do |s, (k,v)|
+            s << "#{k.to_s.upcase}=#{v} "
+          end
+        end
+
         def install_commands #:nodoc:
-          sudo? ? 
-            @cmds.map { |cmd| "#{sudo_cmd}#{cmd}"} :
-            @cmds
+          cmds = @env ? @cmds.map { |cmd| "#{env_str}#{cmd}"} : @cmds
+
+          sudo? ?
+            cmds.map { |cmd| "#{sudo_cmd}#{cmd}"} :
+            cmds
         end
     end
   end

data/lib/sprinkle/installers/source.rb

@@ -102,7 +102,8 @@ module Sprinkle
       end
 
       multi_attributes :enable, :disable, :with, :without, :option,
-        :custom_install, :configure_command, :build_command, :install_command
+        :custom_install
+      attributes :configure_command, :build_command, :install_command
 
       def install_sequence #:nodoc:
         prepare + download + extract + configure + build + install

data/lib/sprinkle/installers/thor.rb

@@ -18,7 +18,6 @@ module Sprinkle
     #   package :spec do
     #     thor 'spec', :file => "/var/setup/Thorfile"
     #   end
-     
     class Thor < Rake
       
       api do

data/lib/sprinkle/installers/user.rb

@@ -11,7 +11,6 @@ module Sprinkle
     #       has_user 'admin', :in_group => "root"
     #     end
     #   end
-    
     class User < Installer
       
       api do

data/lib/sprinkle/policy.rb

@@ -68,8 +68,8 @@ module Sprinkle
     end
 
     # tell a policy which packages are required
-    def requires(package, opts={})
-      @packages << [package, opts]
+    def requires(package, *args)
+      @packages << [package, args]
     end
     
     def packages #:nodoc:
@@ -91,7 +91,8 @@ module Sprinkle
       @packages.each do |p, args|
         cloud_info "  * requires package #{p}"
 
-        package = Sprinkle::Package::PACKAGES.find_all(p, args)
+        opts = args.clone.extract_options!
+        package = Sprinkle::Package::PACKAGES.find_all(p, opts)
         raise "Package definition not found for key: #{p}" unless package
         package = Sprinkle::Package::Chooser.select_package(p, package) if package.is_a? Array # handle virtual package selection
         # get an instance of the package and pass our config options

data/lib/sprinkle/utility/log_recorder.rb

@@ -4,8 +4,8 @@ module Sprinkle
       
       attr_accessor :err, :out, :command, :code
       
-      def initialize
-        reset
+      def initialize(cmd=nil)
+        reset(cmd)
       end
             
       def log(stream, data)

data/lib/sprinkle/verifiers/file.rb

@@ -38,7 +38,7 @@ module Sprinkle
       end
       
       def md5_of_file(path, md5)
-        test "\"`md5sum #{path} | cut -f1 -d' '`\" = \"#{md5}\""
+        test "\"`#{sudo_cmd}md5sum #{path} | cut -f1 -d' '`\" = \"#{md5}\""
       end
       
       def file_contains(path, text)
@@ -55,7 +55,7 @@ module Sprinkle
         raise "Couldn't find local file #{localfile}" unless ::File.exists?(localfile)
         require 'digest/md5'
         local = Digest::MD5.hexdigest(::File.read(localfile))
-        @commands << %{[ "X$(md5sum #{remotefile}|cut -d\\  -f 1)" = "X#{local}" ]}
+        md5_of_file remotefile, local
       end
     end
   end

data/lib/sprinkle/verifiers/permission.rb

@@ -20,19 +20,13 @@ module Sprinkle
       end
 
       def belongs_to_user(path, user)
-        if user.is_a?(Integer)
-          @commands << "find #{path} -maxdepth 0 -uid #{user} | egrep '.*'"
-        else
-          @commands << "find #{path} -maxdepth 0 -user #{user} | egrep '.*'"
-        end
+        arg = user.is_a?(Integer) ? "-uid" : "-user"
+        @commands << "find #{path} -maxdepth 0 #{arg} #{user} | egrep '.*'"
       end
 
       def belongs_to_group(path, group)
-        if group.is_a?(Integer)
-          @commands << "find #{path} -maxdepth 0 -gid #{group} | egrep '.*'"
-        else
-          @commands << "find #{path} -maxdepth 0 -group #{group} | egrep '.*'"
-        end
+        arg = group.is_a?(Integer) ? "-gid" : "-group"
+        @commands << "find #{path} -maxdepth 0 #{arg} #{group} | egrep '.*'"
       end
 
     end

data/lib/sprinkle/verify.rb

@@ -61,7 +61,8 @@ module Sprinkle
   class Verify
     include Sprinkle::Attributes
     include Sprinkle::Package::Rendering::Helpers
-    attr_accessor :package, :description, :commands #:nodoc:
+    include Sprinkle::Sudo
+    attr_accessor :package, :description, :commands, :options #:nodoc:
     
     delegate :opts, :to => :package
     delegate :args, :to => :package

data/lib/sprinkle/version.rb

@@ -1,3 +1,3 @@
 module Sprinkle
-  Version = "0.7.2"
+  Version = "0.7.3"
 end

data/spec/sprinkle/installers/file_spec.rb

@@ -7,8 +7,8 @@ describe Sprinkle::Installers::FileInstaller do
     @package = mock(Sprinkle::Package, :name => 'package', :sudo? => false)
     @empty = Proc.new { }
     @delivery = mock(Sprinkle::Deployment, :install => true)
-		@source = 'source'
-		@destination = 'destination'
+    @source = 'source'
+    @destination = 'destination'
     @contents = "hi"
     @installer = create_file_installer(@destination, :contents => @contents)
     @roles = []
@@ -21,7 +21,7 @@ describe Sprinkle::Installers::FileInstaller do
   def create_file_installer(dest, options={}, &block)
     i = Sprinkle::Installers::FileInstaller.new(@package, dest, options, &block)
     i.delivery = @delivery
-		i
+    i
   end
 
   describe 'when created' do
@@ -34,24 +34,65 @@ describe Sprinkle::Installers::FileInstaller do
   describe 'during installation' do
 
     context "setting mode and owner" do
-      before do 
+      before do
         @installer = create_file_installer @destination, :content => @contents do
           mode "744"
           owner "root"
         end
         @installer_commands = @installer.install_sequence
       end
-      
+
       it "should include command to set owner" do
         @installer_commands.should include("chmod 744 #{@destination}")
       end
-      
+
       it "should include command to set mode" do
         @installer_commands.should include("chown root #{@destination}")
       end
-      
+
+    end
+
+    context "setting mode and owner with sudo" do
+      before do
+        @installer = create_file_installer @destination, :content => @contents do
+          @options[:sudo]= true
+          mode "744"
+          owner "root"
+        end
+        @installer_commands = @installer.install_sequence
+      end
+
+      it "should run commands in correct order" do
+        @installer_commands.should == [
+          :TRANSFER,
+          "sudo mv /tmp/sprinkle_#{@destination} #{@destination}",
+          "sudo chmod 744 #{@destination}",
+          "sudo chown root #{@destination}"
+        ]
+      end
+    end
+
+    context "setting mode and owner with sudo as options" do
+      before do
+        @installer = create_file_installer @destination, :content => @contents,
+          :mode => "744", :owner => "root" do
+          @options[:sudo]= true
+        end
+        @installer_commands = @installer.install_sequence
+      end
+
+      it "should run commands in correct order" do
+        @installer_commands.should == [
+          :TRANSFER,
+          "sudo mv /tmp/sprinkle_#{@destination} #{@destination}",
+          "sudo chown root #{@destination}",
+          "sudo chmod 744 #{@destination}"
+        ]
+      end
+
     end
 
+
     context 'single pre/post commands' do
       before do
         @installer = create_file_installer @destination, :content => @contents do
@@ -67,7 +108,7 @@ describe Sprinkle::Installers::FileInstaller do
       end
 
     end
-    
+
     context 'pre/post with sudo' do
       before do
         @installer = create_file_installer @destination, :content => @contents do
@@ -80,7 +121,7 @@ describe Sprinkle::Installers::FileInstaller do
       end
 
       it "should call the pre and post install commands around the file transfer" do
-        @installer_commands.should == ["op1",:TRANSFER, 
+        @installer_commands.should == ["op1",:TRANSFER,
           "sudo mv /tmp/sprinkle_destination destination", "op2"]
       end
     end
@@ -101,7 +142,7 @@ describe Sprinkle::Installers::FileInstaller do
 
     end
 
-		after do
+    after do
       @installer.process @roles
     end
   end

data/spec/sprinkle/installers/runner_spec.rb

@@ -2,46 +2,63 @@ require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 
 describe Sprinkle::Installers::Runner do
 
-	before do
-		@package = mock(Sprinkle::Package, :name => 'package', :sudo? => false)
-	end
-
-	def create_runner(*cmds)
-	  options=cmds.extract_options!
-		Sprinkle::Installers::Runner.new(@package, cmds, options)
-	end
-
-	describe 'when created' do
-		it 'should accept a single cmd to run' do
-			@installer = create_runner 'teste'
-			@installer.cmds.should == ['teste']
-		end
-		
-		it 'should accept an array of commands to run' do
-			@installer = create_runner ['teste', 'world']
-			@installer.cmds.should == ['teste', 'world']
-			@installer.install_sequence.should == ['teste', 'world']
-	  end
-	end
-
-	describe 'during installation' do
-		
-		it 'should use sudo if specified locally' do
-		  @installer = create_runner 'teste', :sudo => true
-		  @install_commands = @installer.send :install_commands
-		  @install_commands.should == ['sudo teste']
-	  end
-	  
-	  it "should accept multiple commands" do
-	    @installer = create_runner 'teste', 'test2'
-	    @install_commands = @installer.send :install_commands
-	    @install_commands.should == ['teste','test2']
+  before do
+    @package = mock(Sprinkle::Package, :name => 'package', :sudo? => false)
+  end
+
+  def create_runner(*cmds)
+    options=cmds.extract_options!
+    Sprinkle::Installers::Runner.new(@package, cmds, options)
+  end
+
+  describe 'when created' do
+    it 'should accept a single cmd to run' do
+      @installer = create_runner 'teste'
+      @installer.cmds.should == ['teste']
+    end
+
+    it 'should accept an array of commands to run' do
+      @installer = create_runner ['teste', 'world']
+      @installer.cmds.should == ['teste', 'world']
+      @installer.install_sequence.should == ['teste', 'world']
     end
+  end
+
+  describe 'during installation' do
+
+    it 'should use sudo if specified locally' do
+      @installer = create_runner 'teste', :sudo => true
+      @install_commands = @installer.send :install_commands
+      @install_commands.should == ['sudo teste']
+    end
+
+    it "should accept env options and convert to uppercase" do
+      @installer = create_runner 'command1', :env => {
+        :z => 'foo',
+        :PATH => '/some/path',
+        :user => 'deploy',
+        :a => 'bar'
+      }
+      @install_commands = @installer.send :install_commands
+      command_parts = @install_commands.first.split(/ /)
 
-		it 'should run the given command for all specified packages' do
-		  @installer = create_runner 'teste'
-			@install_commands = @installer.send :install_commands
-			@install_commands.should == ['teste']
-		end
-	end
+      command_parts.shift.should == 'env'
+      command_parts.pop.should == 'command1'
+
+      command_parts.should =~ ['PATH=/some/path', 'USER=deploy', 'Z=foo', 'A=bar']
+
+    end
+
+    it "should accept multiple commands" do
+      @installer = create_runner 'teste', 'test2'
+      @install_commands = @installer.send :install_commands
+      @install_commands.should == ['teste','test2']
+    end
+
+    it 'should run the given command for all specified packages' do
+      @installer = create_runner 'teste'
+      @install_commands = @installer.send :install_commands
+      @install_commands.should == ['teste']
+    end
+  end
 end

data/spec/sprinkle/installers/source_spec.rb

@@ -237,9 +237,9 @@ describe Sprinkle::Installers::Source do
       end
 
       it 'should store the custom commands' do
-        @installer.options[:configure_command].first.should == './custom-configure'
-        @installer.options[:build_command].first.should     == 'custom-make'
-        @installer.options[:install_command].first.should   == 'custom-make install'
+        @installer.options[:configure_command].should == './custom-configure'
+        @installer.options[:build_command].should     == 'custom-make'
+        @installer.options[:install_command].should   == 'custom-make install'
       end
 
       it 'should use the custom commands' do

data/spec/sprinkle/verify_spec.rb

@@ -54,12 +54,34 @@ describe Sprinkle::Verify do
 
         # Check for a certain RPM package
         has_rpm 'ntp'
+        
+        belongs_to_user "/etc/", "me"
+        belongs_to_user "/etc/", 2
+        belongs_to_group "/etc/", "root"
+        belongs_to_group "/etc/", 0
       end
     end
     @verification = @package.verifications[0]
-    @delivery = mock(Sprinkle::Deployment, :process => true)
+    @delivery = mock(Sprinkle::Deployment, :process => true, :sudo_command => "sudo")
     @verification.delivery = @delivery
   end
+  
+  describe "with sudo" do
+    before do
+      @package = package @name do
+        use_sudo true
+        gem 'nonexistent'
+        verify 'moo' do
+          md5_of_file "/etc/secret", "123abc"
+        end
+      end
+      @verification = @package.verifications[0]
+      @verification.delivery = @delivery
+    end
+    it "should run sudo when necessary" do
+      @verification.commands.should include(%{test "`sudo md5sum /etc/secret | cut -f1 -d' '`" = "123abc"})
+    end
+  end
 
   describe 'when created' do
     it 'should raise error without a block' do
@@ -68,6 +90,13 @@ describe Sprinkle::Verify do
   end
 
   describe 'with checks' do
+    it "should test that a file belongs to a given user or group" do
+      @verification.commands.should include("find /etc/ -maxdepth 0 -user me | egrep '.*'")
+      @verification.commands.should include("find /etc/ -maxdepth 0 -uid 2 | egrep '.*'")
+      @verification.commands.should include("find /etc/ -maxdepth 0 -group root | egrep '.*'")
+      @verification.commands.should include("find /etc/ -maxdepth 0 -gid 0 | egrep '.*'")
+    end
+    
     it 'should do a "test -f" on the has_file check' do
       @verification.commands.should include('test -f my_file.txt')
     end
@@ -77,7 +106,7 @@ describe Sprinkle::Verify do
     end
 
     it 'should do a md5sum to see if a file matches local file' do
-      @verification.commands.should include(%{[ "X$(md5sum my_file.txt|cut -d\\  -f 1)" = "Xed20d984b757ad5291963389fc209864" ]})
+      @verification.commands.should include(%{test "`md5sum my_file.txt | cut -f1 -d' '`" = "ed20d984b757ad5291963389fc209864"})
     end
 
     it 'should do a "test -d" on the has_directory check' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprinkle
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -158,9 +158,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- bad.rb
 - bin/sprinkle
-- config/deploy.rb
 - examples/packages/build_essential.rb
 - examples/packages/databases/mysql.rb
 - examples/packages/databases/mysql_source.rb
@@ -183,13 +181,13 @@ files:
 - examples/rails/rails.rb
 - examples/rails/templates/mysql.cnf.erb
 - examples/sprinkle/sprinkle.rb
-- inner.rb
 - lib/sprinkle.rb
 - lib/sprinkle/actors/actor.rb
 - lib/sprinkle/actors/capistrano.rb
 - lib/sprinkle/actors/dummy.rb
 - lib/sprinkle/actors/local.rb
 - lib/sprinkle/actors/ssh.rb
+- lib/sprinkle/actors/ssh/connection_cache.rb
 - lib/sprinkle/actors/vlad.rb
 - lib/sprinkle/core.rb
 - lib/sprinkle/deployment.rb
@@ -201,6 +199,7 @@ files:
 - lib/sprinkle/extensions/attributes.rb
 - lib/sprinkle/extensions/blank_slate.rb
 - lib/sprinkle/extensions/string.rb
+- lib/sprinkle/extensions/sudo.rb
 - lib/sprinkle/extensions/symbol.rb
 - lib/sprinkle/installers/apt.rb
 - lib/sprinkle/installers/binary.rb
@@ -299,8 +298,6 @@ files:
 - spec/templates/test.erb
 - sprinkle.gemspec
 - templates/test.erb
-- test.rb
-- work/inner.rb
 homepage: https://github.com/sprinkle-tool/sprinkle
 licenses:
 - MIT

data/bad.rb

@@ -1,16 +0,0 @@
-package :ubuntu_version do
-  runner "lsb_release -r"
-end
-
-
-policy :myapp, :roles => :app do
-  requires :ubuntu_version
-end
-
-deployment do
-  delivery :ssh do
-    user 'root'
-    password 'secret'
-    role :app, 'server'
-  end
-end

data/config/deploy.rb

@@ -1,25 +0,0 @@
-set :application, "set your application name here"
-set :repository,  "set your repository location here"
-
-# set :scm, :git # You can set :scm explicitly or Capistrano will make an intelligent guess based on known version control directory names
-# Or: `accurev`, `bzr`, `cvs`, `darcs`, `git`, `mercurial`, `perforce`, `subversion` or `none`
-
-role :web, "pastie.org"                          # Your HTTP server, Apache/etc
-role :app, "pastie.org"                          # This may be the same as your `Web` server
-role :db,  "pastie.org", :primary => true # This is where Rails migrations will run
-role :db,  "pastie.org"
-
-# if you want to clean up old releases on each deploy uncomment this:
-# after "deploy:restart", "deploy:cleanup"
-
-# if you're still using the script/reaper helper you will need
-# these http://github.com/rails/irs_process_scripts
-
-# If you are using Passenger mod_rails uncomment this:
- namespace :deploy do
-   task :start do ; end
-#   task :stop do ; end
-#   task :restart, :roles => :app, :except => { :no_release => true } do
-#     run "#{try_sudo} touch #{File.join(current_path,'tmp','restart.txt')}"
-#   end
-end

data/inner.rb

@@ -1,45 +0,0 @@
-policy :twice, :roles => :app do
-  requires :hostname
-  # requires :db
-  # requires :web, :name => "bob"
-  # requires :web, :name => "suzy"
-  # requires :web, :name => "nick"
-end
-
-package :hostname do
-  apt "test" do
-    pre :install do
-      runner "BEFORE"
-      runner "BEFORE 2"
-    end
-    post :install do
-      runner "AFTER" do
-        pre(:install) { runner "before after" }
-        post(:install) { runner "after after" }
-      end
-    end
-  end
-end
-
-deployment do
-  
-  # delivery :dummy do
-  #   role :app, 'beta1.pastie.org'
-  #   role :app, 'beta2.pastie.org'
-  # end
-
-  # use vlad for deployment
-  # delivery :ssh do
-  #   role :app, 'beta1.pastie.org'
-  #   user "appz"
-  # end
-  
-  # delivery :capistrano
-  delivery :capistrano do
-    role :app, 'beta1.pastie.org'
-    # role :app, 'beta2.pastie.org'
-    set :user, "appz"
-    set :use_sudo, true
-  end
-
-end

data/test.rb

@@ -1,102 +0,0 @@
-# package :echo do
-#   runner "echo hello world"
-# end
-# 
-# package :version do
-#   runner "cat /etc/lsb-release"
-# end
-# 
-# policy :once, :roles => :app do
-#   requires :echo
-#   requires :version
-# end
-# 
-package :db do
-  # go do
-  #   puts "<eval db>"
-  #   runner "installing the db"
-  # end
-  verify do
-    has_file "/etc/db"
-  end
-  # runner "finalized"
-end
-
-package :hostname do
-  # go do
-  #   # puts "<eval hostname : #{hostname}>"
-  #   runner "echo #{hostname} > /etc/hostname", :sudo => true
-  # end
-  # push_text "now", "/etc/stupid_file"
-  # details "using name: front.pastie.org"
-  
-  # runner "echo 'hostname'"
-  # runner "cat /etc/hostname"
-  
-  version "5"
-  
-  @what = "secret"
-  @something = "else"
-  file "/Users/jgoebel/notnow#{version}", :contents => c=render(:first)
-  # transfer "<%= @what %>\n<%= @what + something %>", "/Users/jgoebel/notnow2", :render => true,
-  # :binding => binding
-  
-  verify do
-    has_file "/Users/jgoebel/notnow#{version}"
-    # md5_of_file "/Users/jgoebel/notnow", md5(c)
-  end
-  # verify do
-  #   has_executable "/bin/ccc"
-  # end
-end
-
-package :web do
-  requires :db
-  
-  # go do
-  #   # puts "<eval web>"
-  #   runner "installing web #{opts[:name]}"
-  # end
-  # runner "finalized"
-  
-  verify do
-    # has_file "/etc/web/#{opts[:name]}"
-  end
-end
-
-policy :twice, :roles => :app do
-  requires :hostname
-  # requires :db
-  # requires :web, :name => "bob"
-  # requires :web, :name => "suzy"
-  # requires :web, :name => "nick"
-end
-
-deployment do
-  
-  # delivery :dummy do
-  #   role :app, 'beta1.pastie.org'
-  #   role :app, 'beta2.pastie.org'
-  # end
-  
-  delivery :local
-  
-  # delivery :vlad do
-  #   script "vlad"
-  # end
-
-  # use ssh for deployment
-  # delivery :ssh do
-  #   role :app, 'front.pastie.org'
-  #   user "appz"
-  # end
-  
-  # delivery :capistrano
-  # delivery :capistrano do
-  #   role :app, 'beta1.pastie.org'
-    # role :app, 'beta2.pastie.org'
-    # set :user, "appz"
-    # set :use_sudo, true
-  # end
-
-end

data/work/inner.rb

@@ -1,24 +0,0 @@
-policy :sprinkle, :roles => :app do
-  requires :sprinkle
-end
-
-package :sprinkle do
-  i=runner "test" do
-    # pre(:install) { install Installers::Runner.new(self,"before") }
-    # pre(:install) { runner "pre" }
-    # post(:install) { runner "after" }
-    post(:install) { noop }
-  end
-  # puts runner("blah")
-  # puts i.inspect
-  runner "next"
-end
-
-deployment do
-
-  # use vlad for deployment
-  delivery :dummy do
-    # role :app, 'yourhost.com'
-  end
-
-end