sprinkle 0.3.1 → 0.3.2

data/lib/sprinkle/installers/runner.rb

@@ -0,0 +1,18 @@
+module Sprinkle
+	module Installers
+		class Runner < Installer
+			attr_accessor :cmd #:nodoc:
+
+			def initialize(parent, cmd) #:nodoc:
+				super parent
+				@cmd = cmd
+			end
+
+			protected
+				
+				def install_commands #:nodoc:
+					@cmd
+				end
+		end
+	end
+end

data/lib/sprinkle/installers/smart.rb

@@ -0,0 +1,29 @@
+module Sprinkle
+  module Installers
+    class Smart < Installer
+      attr_accessor :packages #:nodoc:
+
+      def initialize(parent, packages, &block) #:nodoc:
+        super parent, &block
+        packages = [packages] unless packages.is_a? Array
+        @packages = packages
+      end
+
+      protected
+
+      def install_commands #:nodoc:
+        "smart install #{@packages.join(' ')} -y 2>&1 | tee -a /var/log/smart-sprinkle"
+      end
+    end
+  end
+end
+
+module Sprinkle
+  module Package
+    class Package
+      def smart(*names, &block)
+        @installer = Sprinkle::Installers::Smart.new(self, *names, &block)
+      end
+    end
+  end
+end

data/lib/sprinkle/installers/source.rb

@@ -3,8 +3,8 @@ module Sprinkle
     # = Source Package Installer
     #
     # The source package installer installs software from source.
-    # It handles downloading, extracting, configuring, building, 
-    # and installing software. 
+    # It handles downloading, extracting, configuring, building,
+    # and installing software.
     #
     # == Configuration Options
     #
@@ -22,7 +22,7 @@ module Sprinkle
     # * <b>configure</b> - Configure is the stage which the ./configure script is run.
     # * <b>build</b> - Build is the stage in which `make` is called.
     # * <b>install</b> - Install is the stage which `make install` is called.
-    # 
+    #
     # == Example Usage
     #
     # First, a simple package, no configuration:
@@ -63,7 +63,7 @@ module Sprinkle
     #   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 
+    # block and calling the option as a method with the value as
     # its parameter.
 
     class Source < Installer
@@ -97,7 +97,11 @@ module Sprinkle
         end
 
         def download_commands #:nodoc:
-          [ "wget -cq --directory-prefix='#{@options[:archives]}' #{@source}" ]
+          if File.exist? @source
+            [ "cp #{@source} #{@options[:archives]}/#{archive_name}" ]
+          else
+            [ "wget -cq --directory-prefix='#{@options[:archives]}' #{@source}" ]
+          end
         end
 
         def extract_commands #:nodoc:
@@ -162,7 +166,7 @@ module Sprinkle
           when /tar$/
             'tar xf'
           when /zip$/
-            'unzip'
+            'unzip -o'
           else
             raise "Unknown source archive format: #{archive_name}"
           end

data/lib/sprinkle/installers/transfer.rb

@@ -72,7 +72,8 @@ 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.
+		# variables in the package scope). When render is true, recursive is turned off. Note
+		# you can also explicitly pass locals in to render with the :locals option.
 		#   
 		#   package :nginx_conf do
 		#     nginx_port = 8080
@@ -118,7 +119,7 @@ module Sprinkle
 			
 			def render_template_file(path, context, prefix)
 				template = File.read(path)
-				tempfile = render_template(template, binding(), @package.name)
+				tempfile = render_template(template, context, @package.name)
 				tempfile
 			end
 			
@@ -139,8 +140,21 @@ module Sprinkle
 					
 					recursive = @options[:recursive]
 					
-					if options[:render] 
-						tempfile = render_template_file(@source, binding(), @package.name)
+					if options[:render]
+					  if options[:locals]
+					    context = {}
+					    options[:locals].each_pair do |k,v|
+					      if v.respond_to?(:call)
+					        context[k] = v.call
+					      else
+					        context[k] = v
+					      end
+					    end
+					  else
+					    context = binding()
+					  end
+					  
+						tempfile = render_template_file(@source, context, @package.name)
 						sourcepath = tempfile.path
 						logger.info "Rendering template #{@source} to temporary file #{sourcepath}"
 						recursive = false

data/lib/sprinkle/installers/user.rb

@@ -0,0 +1,15 @@
+module Sprinkle
+  module Installers
+    class User < Installer
+      def initialize(package, username, options, &block)
+        super package, &block
+        @username=username
+        @options =options
+      end
+      protected 
+      def install_commands
+        "adduser #{@options[:flags]} #{@username}"
+      end
+    end
+  end
+end

data/lib/sprinkle/installers/zypper.rb

@@ -0,0 +1,43 @@
+module Sprinkle
+  module Installers
+    # = Zypper Installer
+    #
+    # Zypper is a command-line interface to ZYpp system management library.
+    # It mostly be used on Suse or OpenSuse.
+    # 
+    # == Example Usage
+    #
+    # Installing the magic_beans package via Zypper. Its all the craze these days.
+    #
+    #   package :magic_beans do
+    #     zypper 'magic_beans'
+    #   end
+    #
+    # You may also specify multiple packages as an array:
+    #
+    #   package :magic_beans do
+    #     zypper %w(magic_beans magic_sauce)
+    #   end
+    #
+    # or an argument list:
+    #
+    #   package :magic_beans do
+    #     zypper "magic_beans", "magic_sauce"
+    #   end
+    class Zypper < Installer
+      attr_accessor :packages #:nodoc:
+
+      def initialize(parent, *packages, &block) #:nodoc:
+        packages.flatten!
+        super parent, &block
+        @packages = packages
+      end
+
+      protected
+
+      def install_commands #:nodoc:
+        "zypper -n install -l -R #{@packages.join(' ')}"
+      end
+    end
+  end
+end

data/lib/sprinkle/package.rb

@@ -121,6 +121,9 @@ module Sprinkle
         @installers = []
         self.instance_eval &block
       end
+      def add_user(username, options={},  &block)
+        @installers<<Sprinkle::Installers::User.new(self, username, options, &block)
+      end
 
       def freebsd_pkg(*names, &block)
         @installers << Sprinkle::Installers::FreebsdPkg.new(self, *names, &block)
@@ -162,6 +165,10 @@ module Sprinkle
         @installers << Sprinkle::Installers::Yum.new(self, *names, &block)
       end
 
+      def zypper(*names, &block)
+        @installers << Sprinkle::Installers::Zypper.new(self, *names, &block)
+      end
+
       def gem(name, options = {}, &block)
         @recommends << :rubygems
         @installers << Sprinkle::Installers::Gem.new(self, name, options, &block)
@@ -188,10 +195,18 @@ module Sprinkle
         @installers << Sprinkle::Installers::PushText.new(self, text, path, options, &block)
       end
 
+      def replace_text(regex, text, path, options={}, &block)
+        @installers << Sprinkle::Installers::ReplaceText.new(self, regex, text, path, options, &block)
+      end
+      
       def transfer(source, destination, options = {}, &block)
         @installers << Sprinkle::Installers::Transfer.new(self, source, destination, options, &block)
       end
 
+			def runner(cmd)
+				@installers << Sprinkle::Installers::Runner.new(self, cmd)
+			end
+
       def verify(description = '', &block)
         @verifications << Sprinkle::Verify.new(self, description, &block)
       end  

data/lib/sprinkle/verifiers/apt.rb

@@ -0,0 +1,21 @@
+module Sprinkle
+  module Verifiers
+    # = Apt package Verifier
+    #
+    # Contains a verifier to check the existance of an Apt package.
+    # 
+    # == Example Usage
+    #
+    #   verify { has_apt 'ntp' }
+    #
+    module Apt
+      Sprinkle::Verify.register(Sprinkle::Verifiers::Apt)
+
+      # Checks to make sure the apt <tt>package</tt> exists on the remote server.
+      def has_apt(package)
+        @commands << "dpkg --status #{package} | grep \"ok installed\""
+      end
+
+    end
+  end
+end

data/lib/sprinkle/verifiers/file.rb

@@ -21,6 +21,14 @@ module Sprinkle
       def file_contains(path, text)
         @commands << "grep '#{text}' #{path}"
       end
+      def user_present(username) 
+        @commands << %Q{grep -q -e  \'^#{username}:x\' /etc/passwd && test -d ~#{username}}
+      end
+      def matches_local(localfile, remotefile, mode=nil)
+        raise "Couldn't find local file #{localfile}" unless ::File.exists?(localfile)
+        local = `md5 #{localfile}`.split.last
+        @commands << %{[ "X$(md5sum #{remotefile}|cut -d\\  -f 1)" = "X#{local}" ]}
+      end
     end
   end
-end
+end

data/lib/sprinkle/verifiers/package.rb

@@ -0,0 +1,26 @@
+module Sprinkle
+  module Verifiers
+    module Package
+      Sprinkle::Verify.register(Sprinkle::Verifiers::Package)
+
+      def has_package(*packages)
+        if packages.is_a?(Array) && packages.first.is_a?(Array)
+          packages = packages.first
+        else
+          packages = [packages] unless packages.is_a? Array
+        end
+
+        packages.each do |pak|
+          case Sprinkle::Installers::InstallPackage.installer
+            when :yum
+              @commands << "[ -n \"`yum list installed #{pak} 2> /dev/null | egrep -e \\\"#{pak}\\\"`\" ]"
+            else
+              raise "Unknown InstallPackage.installer"
+          end
+        end
+      end
+
+      alias_method :has_packages, :has_package  
+    end
+  end
+end

data/lib/sprinkle/verifiers/process.rb

@@ -14,8 +14,8 @@ module Sprinkle
       # Checks to make sure <tt>process</tt> is a process running
       # on the remote server.
       def has_process(process)
-        @commands << "ps aux | grep '#{process}' | grep -v grep"
+        @commands << "ps -C #{process}"
       end
     end
   end
-end
+end

data/lib/sprinkle/verifiers/ruby.rb

@@ -17,8 +17,8 @@ module Sprinkle
       
       # Checks if a gem exists by calling "sudo gem list" and grepping against it.
       def has_gem(name, version=nil)
-        version = version.nil? ? '' : version.gsub('.', '\.')
-        @commands << "sudo gem list | grep -e '^#{name} (.*#{version}.*)$'"
+        version = version.nil? ? '' : "--version '#{version}'"
+        @commands << "sudo gem list '#{name}' --installed #{version} > /dev/null"
       end
     end
   end

data/lib/sprinkle/verify.rb

@@ -6,7 +6,7 @@ module Sprinkle
   # block fails, Sprinkle will stop the script gracefully, raising the error.
   # 
   # In addition to checking post install if it was successfully, verification
-  # blocks are also ran before an install to see if a package is <em>already</em>
+  # blocks are also run before an install to see if a package is <em>already</em>
   # installed. If this is the case, the package is skipped and Sprinkle continues
   # with the next package. This behavior can be overriden by setting the -f flag on
   # the sprinkle script or setting Sprinkle::OPTIONS[:force] to true if you're
@@ -111,4 +111,4 @@ module Sprinkle
       @description = description
     end
   end
-end
+end

data/spec/sprinkle/installers/push_text_spec.rb

@@ -32,11 +32,11 @@ describe Sprinkle::Installers::PushText do
     end
 
     it 'should invoke the push text installer for all specified packages' do
-      @install_commands.should == %q[echo -e 'another-hair-brained-idea' |tee -a /dev/mind/late-night]
+      @install_commands.should == %q[/bin/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 -e 'another-hair-brained-idea' |tee -a /dev/mind/late-night", 'op2' ]
+      @installer.send(:install_sequence).should == [ 'op1', "/bin/echo -e 'another-hair-brained-idea' |tee -a /dev/mind/late-night", 'op2' ]
     end
 
   end
@@ -48,7 +48,7 @@ describe Sprinkle::Installers::PushText do
     end
     
     it "should invoke the push installer with sudo" do
-      @install_commands.should == %q[echo -e 'a special user' |sudo tee -a /dev/mind/the-day-after]
+      @install_commands.should == %q[/bin/echo -e 'a special user' |sudo tee -a /dev/mind/the-day-after]
     end
   end
   
@@ -59,7 +59,7 @@ describe Sprinkle::Installers::PushText do
     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]
+      @install_commands.should == %q[/bin/echo -e 'I'\''m a string with a single quote' |tee -a /dev/mind/the-day-after]
     end
   end
 

data/spec/sprinkle/installers/replace_text_spec.rb

@@ -0,0 +1,45 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sprinkle::Installers::ReplaceText do
+
+  before do
+    @package = mock(Sprinkle::Package, :name => 'package')
+    @options = {:sudo => true}
+  end
+
+  def create_replacement_text(regex, text, path, options={}, &block)
+    Sprinkle::Installers::ReplaceText.new(@package, regex, text, path, options, &block)
+  end
+
+  describe 'when created' do
+
+    it 'should accept text to replace, replacement, and path' do
+      @installer = create_replacement_text 'text_to_replace', 'new_text', '/etc/example/foo.conf'
+      @installer.regex.should == 'text_to_replace'
+      @installer.text.should == 'new_text'
+      @installer.path.should == '/etc/example/foo.conf'
+    end
+
+  end
+
+  describe 'during installation' do
+
+    before do
+      @installer = create_replacement_text 'bad option', 'super option', '/etc/brand/new.conf' do
+        pre :install, 'op1'
+        post :install, 'op2'
+      end
+      @install_commands = @installer.send :install_commands
+    end
+
+    it 'should invoke the replace text installer for all specified packages' do
+      @install_commands.should == %q[sed -i 's/bad option/super option/g' /etc/brand/new.conf]
+    end
+
+    it 'should automatically insert pre/post commands for the specified package' do
+      @installer.send(:install_sequence).should == [ 'op1', "sed -i 's/bad option/super option/g' /etc/brand/new.conf", 'op2' ]
+    end
+
+  end
+
+end

data/spec/sprinkle/installers/runner_spec.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Sprinkle::Installers::Runner do
+
+	before do
+		@package = mock(Sprinkle::Package, :name => 'package')
+	end
+
+	def create_runner(cmd)
+		Sprinkle::Installers::Runner.new(@package, cmd)
+	end
+
+	describe 'when created' do
+		it 'should accept a single cmd to run' do
+			@installer = create_runner 'teste'
+			@installer.cmd.should == 'teste'
+		end
+	end
+
+	describe 'during execution' do
+
+		before do
+			@installer = create_runner 'teste'
+			@install_commands = @installer.send :install_commands
+		end
+
+		it 'should run the given command for all specified packages' do
+			@install_commands.should == 'teste'
+		end
+	end
+end