sprinkle 0.4.2 → 0.5.0.rc1

data/lib/sprinkle/verifiers/permission.rb

@@ -0,0 +1,40 @@
+module Sprinkle
+  module Verifiers
+    # = Permission and ownership Verifier
+    #
+    # Contains a verifier to check the permissions and ownership of a file or directory.
+    # 
+    # == Example Usage
+    #
+    #   verify { has_permission '/etc/apache2/apache2.conf', 0644 }
+    #
+    #   verify { belongs_to_user '/etc/apache2/apache2.conf', 'noop' }
+    #
+    #   verify { belongs_to_user '/etc/apache2/apache2.conf', 1000 }
+    #
+    module Permission
+      Sprinkle::Verify.register(Sprinkle::Verifiers::Permission)
+
+      def has_permission(path, permission)
+        @commands << "find #{path} -maxdepth 0 -perm #{permission} | egrep '.*'"
+      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
+      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
+      end
+
+    end
+  end
+end

data/lib/sprinkle/verifiers/symlink.rb

@@ -20,9 +20,9 @@ module Sprinkle
       # given, it checks that <tt>symlink</tt> points to <tt>file</tt>
       def has_symlink(symlink, file = nil)
         if file.nil?
-          @commands << "test -L #{symlink}"
+          test "-L #{symlink}"
         else
-          @commands << "test '#{file}' = `readlink #{symlink}`"
+          test "'#{file}' = `readlink #{symlink}`"
         end
       end
     end

data/lib/sprinkle/verifiers/test.rb

@@ -0,0 +1,21 @@
+module Sprinkle
+  module Verifiers
+    # = Test Verifier
+    #
+    # Checks that a specific test runs successfully (using the unix test command)
+    # 
+    # == Example Usage
+    #
+    #   verify { test '-f /some_file' }
+    #
+    module Test
+      Sprinkle::Verify.register(Sprinkle::Verifiers::Test)
+
+      # Checks to make sure a test runs successfully on the remote server
+      def test(args)
+        @commands << "test #{args}"
+      end
+
+    end
+  end
+end

data/lib/sprinkle/verify.rb

@@ -84,16 +84,16 @@ module Sprinkle
     def process(roles, pre = false) #:nodoc:
       assert_delivery
       
-      description = @description.empty? ? @package.name : @description
+      description = @description.empty? ? " (#{@package.name})" : @description
       
       if logger.debug?
         logger.debug "#{@package.name}#{description} verification sequence: #{@commands.join('; ')} for roles: #{roles}\n"
       end
       
       unless Sprinkle::OPTIONS[:testing]
-        logger.info "#{" " * @options[:padding]}--> Verifying #{description}..."
+        logger.debug "#{" " * @options[:padding]}--> Verifying #{description}..."
         
-        unless @delivery.process(@package.name, @commands, roles, true)
+        unless @delivery.verify(self, roles)
           # Verification failed, halt sprinkling gracefully.
           raise Sprinkle::VerificationFailed.new(@package, description)
         end

data/lib/sprinkle/version.rb

@@ -0,0 +1,3 @@
+module Sprinkle
+  Version = "0.5"
+end

data/spec/fixtures/my_file.txt

@@ -0,0 +1 @@
+...

data/spec/sprinkle/actors/capistrano_spec.rb

@@ -146,6 +146,9 @@ describe Sprinkle::Actors::Capistrano do
       @cap = create_cap do; recipes 'deploy'; end
       @cap.stub!(:run).and_return
       
+      @package = Package.new(@name) {}
+      @installer = Sprinkle::Installers::Transfer.new(@package, "file.txt","/tmp/file.txt")
+      
       @testing_errors = false
     end
 
@@ -176,7 +179,7 @@ describe Sprinkle::Actors::Capistrano do
     end
 
     after do
-      @cap.transfer @name, @source, @dest, @roles unless @testing_errors
+      @cap.process @package.name, @installer.install_sequence, @roles
     end
   end
 
@@ -221,6 +224,10 @@ describe Sprinkle::Actors::Capistrano do
 
       @cap = create_cap do; recipes 'deploy'; end
       @cap.config.stub!(:upload).and_return
+      
+      @package = Package.new(@name) {}
+      @installer = Sprinkle::Installers::Transfer.new(@package, @source, @dest, :recursive => true)
+      @cap.instance_variable_set("@installer", @installer)
     end
 
     it 'should call upload with the source and destination via :scp' do
@@ -233,7 +240,8 @@ describe Sprinkle::Actors::Capistrano do
     end
 
     after do
-      @cap.transfer @name, @source, @dest, @roles
+      @installer.instance_variable_set("@delivery", @cap)
+      @installer.process(@roles)
     end
   end
 
@@ -246,6 +254,10 @@ describe Sprinkle::Actors::Capistrano do
 
       @cap = create_cap do; recipes 'deploy'; end
       @cap.config.stub!(:upload).and_return
+      
+      @package = Package.new(@name) {}
+      @installer = Sprinkle::Installers::Transfer.new(@package, @source,@dest, :recursive => false)
+      @cap.instance_variable_set("@installer", @installer)
     end
 
     it 'should call upload with the source and destination via :scp' do
@@ -258,7 +270,8 @@ describe Sprinkle::Actors::Capistrano do
     end
 
     after do
-      @cap.transfer @name, @source, @dest, @roles, false
+      @installer.instance_variable_set("@delivery", @cap)
+      @installer.process(@roles)
     end
   end
 

data/spec/sprinkle/actors/local_spec.rb

@@ -4,26 +4,44 @@ describe Sprinkle::Actors::Local do
 
   before do
     @local = Sprinkle::Actors::Local.new
+    
+    @package = Package.new("super") {}
   end
 
-  describe 'when processing commands' do
+  describe 'when installing' do
 
     before do
+      @installer = Sprinkle::Installers::Runner.new(@package, "echo hi")
       @commands = %w( op1 op2 )
       @roles    = %w( app )
       @name     = 'name'
-    
-      @local.stub!(:system).and_return
+
+      @local.stub!(:run_command).and_return(0)
     end
 
     it 'should run the commands on the local system' do
-      @local.should_receive(:system).twice.and_return
+      @local.should_receive(:run_command).once.and_return(0)
+      @local.install @installer, @roles
     end
+
+  end
+  
+  describe 'when verifying' do
     
-    after do
-      @local.process @name, @commands, @roles
+    before do
+      @verifier = Sprinkle::Verify::new(@package) {}
+      @verifier.commands += ["test","test"]
+      @roles    = %w( app )
+      @name     = 'name'
+
+      @local.stub!(:run_command).and_return(0)
     end
 
+    it 'should run the commands on the local system' do
+      @local.should_receive(:run_command).twice.and_return
+      @local.verify @verifier, @roles
+    end
+    
   end
 
 end

data/spec/sprinkle/actors/ssh_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Sprinkle::Actors::SSH do
+  describe 'process' do
+    before do
+      subject.stub(:gateway_defined?).and_return(false)
+    end
+    
+    subject do
+      Sprinkle::Actors::SSH.new do
+        role :app, "booger.com"
+      end
+    end
+
+    let(:commands) { %w[one two three] }
+    let(:roles) { %w[app] }
+
+    describe 'when use_sudo is true' do
+      before do
+        subject.use_sudo(true)
+      end
+
+      it 'prepends "sudo" to each command' do
+        subject.send(:prepare_commands,commands).should == ['sudo one', 'sudo two', 'sudo three']
+      end
+    end
+
+    describe 'when use_sudo is false' do
+      before do
+        subject.use_sudo(false)
+      end
+
+      it 'does not prepend "sudo" to each command' do
+        subject.send(:prepare_commands,commands).should == commands
+      end
+    end
+  end
+end

data/spec/sprinkle/installers/apt_spec.rb

@@ -3,11 +3,17 @@ require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 describe Sprinkle::Installers::Apt do
 
   before do
-    @package = mock(Sprinkle::Package, :name => 'package')
+    @package = create_pkg "name", :use_sudo => false
+  end
+  
+  def create_pkg(name="name", opts={})
+    @package = Sprinkle::Package::Package.new(name) {}
+    @package.use_sudo opts[:use_sudo]
+    @package
   end
 
   def create_apt(*debs, &block)
-    Sprinkle::Installers::Apt.new(@package, *debs, &block)
+    installer=@package.apt *debs, &block
   end
 
   describe 'when created' do
@@ -28,6 +34,7 @@ describe Sprinkle::Installers::Apt do
     end
 
   end
+  
 
   describe 'during installation' do
 
@@ -38,6 +45,20 @@ describe Sprinkle::Installers::Apt do
       end
       @install_commands = @installer.send :install_commands
     end
+    
+    it 'should use sudo if package specifies' do
+      @package = create_pkg "name", :use_sudo => true
+      @installer = create_apt 'ruby'
+      @install_commands = @installer.send :install_commands
+      @install_commands.should =~ /sudo apt-get/
+    end
+    
+    it 'should use sudo if installer specifies' do
+      @package = create_pkg "name", :use_sudo => false
+      @installer = create_apt 'ruby', :sudo => true
+      @install_commands = @installer.send :install_commands
+      @install_commands.should =~ /sudo apt-get/
+    end
 
     it 'should invoke the apt installer for all specified packages' do
       @install_commands.should =~ /apt-get --force-yes -qyu install ruby/

data/spec/sprinkle/installers/binary_spec.rb

@@ -3,25 +3,23 @@ require File.expand_path("../../spec_helper", File.dirname(__FILE__))
 describe Sprinkle::Installers::Binary do
   include Sprinkle::Deployment
 
-  def create_context
-    binary = 'http://www.example.com/archive.tar.gz'
-
+  def create_context(source = 'http://www.example.com/archive.tar.gz')
     deployment = deployment do
       delivery :capistrano
-      binary "http://www.example.com/archive.tar.gz" do
+      binary source do
         prefix   '/prefix/directory'
         archives '/archives/directory'
       end
     end
 
-    installer = create_binary binary do
+    installer = create_binary source do
       prefix   '/prefix/directory'
       archives '/archives/directory'
     end
 
     installer.defaults(@deployment)
-    
-    [binary, deployment, installer]
+
+    [source, deployment, installer]
   end
 
   def create_binary(binary, version = nil, &block)
@@ -33,7 +31,7 @@ describe Sprinkle::Installers::Binary do
     before do
       @binary, @deployment, @installer = create_context
     end
-    
+
     it "should return mkdir command to create the prefix directory" do
       @installer.send(:prepare_commands)[0].should == 'mkdir -p /prefix/directory'
     end
@@ -41,24 +39,34 @@ describe Sprinkle::Installers::Binary do
       @installer.send(:prepare_commands)[1].should == 'mkdir -p /archives/directory'
     end
   end
-  
-  
+
+
   describe "binary#install_commands" do
     before do
       @binary, @deployment, @installer = create_context
     end
-    
+
     it "should return a commands to place the binary in the correct archive directory" do
       @installer.send(:install_commands)[0].should =~ /--directory-prefix=\/archives\/directory/
     end
-    
+
     it "should return a command to extract to the correct prefix folder" do
       @installer.send(:install_commands)[1].should =~ /cd \/prefix\/directory/
     end
 
     it "should return a command to extract the right file in the right directory" do
-      @installer.send(:install_commands)[1].should =~ / \/archives\/directory\/archive.tar.gz/
+      @installer.send(:install_commands)[1].should =~ / '\/archives\/directory\/archive.tar.gz'/
     end
   end
-  
+
+  describe "when source contains spaces (%20's) in path" do
+    before do
+      _, _, @installer = create_context('http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.1%20x64.tar.bz2')
+    end
+
+    it "should correctly interpret the archive filename as it gets extracted downloaded to file system" do
+      @installer.send(:install_commands)[1].should =~ / '\/archives\/directory\/Sublime Text 2.0.1 x64.tar.bz2'/
+    end
+  end
+
 end

data/spec/sprinkle/installers/brew_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 describe Sprinkle::Installers::Brew do
 
   before do
-    @formula = mock(Sprinkle::Package, :name => 'formula')
+    @formula = mock(Sprinkle::Package, :name => 'formula', :sudo? => false)
   end
 
   def create_brew(*formulas, &block)
@@ -14,17 +14,17 @@ describe Sprinkle::Installers::Brew do
 
     it 'should accept a single package to install' do
       @installer = create_brew 'ruby'
-      @installer.formulas.should == [ 'ruby' ]
+      @installer.packages.should == [ 'ruby' ]
     end
 
     it 'should accept an array of packages to install' do
       @installer = create_brew %w( gcc gdb g++ )
-      @installer.formulas.should == ['gcc', 'gdb', 'g++']
+      @installer.packages.should == ['gcc', 'gdb', 'g++']
     end
 
     it 'should remove options from packages list' do
       @installer = create_brew 'ruby'
-      @installer.formulas.should == [ 'ruby' ]
+      @installer.packages.should == [ 'ruby' ]
     end
 
   end

data/spec/sprinkle/installers/installer_spec.rb

@@ -7,7 +7,7 @@ describe Sprinkle::Installers::Installer do
     @package = mock(Sprinkle::Package, :name => 'package')
     @empty = Proc.new { }
     @sequence = ['op1', 'op2']
-    @delivery = mock(Sprinkle::Deployment, :process => true)
+    @delivery = mock(Sprinkle::Deployment, :process => true, :install => true)
     @installer = create_installer
     @installer.delivery = @delivery
     @roles = []
@@ -61,9 +61,9 @@ describe Sprinkle::Installers::Installer do
 
   describe 'during installation' do
 
-    it 'should request the install sequence from the concrete class' do
-      @installer.should_receive(:install_sequence).and_return(@sequence)
-    end
+    # it 'should request the install sequence from the concrete class' do
+    #   @installer.should_receive(:install_sequence).and_return(@sequence)
+    # end
 
     describe 'when testing' do
 
@@ -81,10 +81,39 @@ describe Sprinkle::Installers::Installer do
       end
 
     end
+    
+    describe "with sudo from package level" do
+      before do
+        @installer.package = mock(Sprinkle::Package, :name => 'package', :sudo? => true)
+      end
+      
+      it "should know it uses sudo" do
+        @installer.sudo?.should == true
+      end
+      
+      it "should offer up the sudo command" do
+        @installer.sudo_cmd.should =~ /sudo /
+      end      
+    end
+    
+    describe "with sudo" do
+      before do
+        @installer = Sprinkle::Installers::Installer.new @package, :sudo => true
+        @installer.delivery = @delivery
+      end
+      
+      it "should know it uses sudo" do
+        @installer.sudo?.should == true
+      end
+      
+      it "should offer up the sudo command" do
+        @installer.sudo_cmd.should =~ /sudo /
+      end
+    end
 
     describe 'when in production' do
       it 'should invoke the delivery mechanism to process the install sequence' do
-        @delivery.should_receive(:process).with(@package.name, @sequence, @roles)
+        @delivery.should_receive(:install).with(@installer, @roles, :per_host => false)
       end
     end
     
@@ -130,12 +159,12 @@ describe Sprinkle::Installers::Installer do
           @installer.send(:install_sequence).should == [ "a", "b", "c", 'installer' ]
         end
       end
-      describe "blocks as commands" do
+      describe "arrays as commands" do
         before(:each) do
           @array = ["a", "b"]
           @installer = create_installer_with_pre_command(@array)
         end
-        it "should be able to store a block if it's the pre command" do
+        it "should be able to store an array if it's the pre command" do
           @installer.send(:install_sequence).should == [ @array, 'installer' ].flatten
         end
       end