sprinkle 0.4.2 → 0.5.0.rc1

data/lib/sprinkle/installers/replace_text.rb

@@ -25,6 +25,12 @@ module Sprinkle
     #
     class ReplaceText < Installer
       attr_accessor :regex, :text, :path #:nodoc:
+      
+      api do
+        def replace_text(regex, text, path, options={}, &block)
+          install Sprinkle::Installers::ReplaceText.new(self, regex, text, path, options, &block)
+        end
+      end
 
       def initialize(parent, regex, text, path, options={}, &block) #:nodoc:
         super parent, options, &block
@@ -32,11 +38,14 @@ module Sprinkle
         @text = text
         @path = path
       end
+      
+      def announce
+        log "--> Replace '#{@regex}' with '#{@text}' in file #{@path}"
+      end
 
       protected
-
+      
         def install_commands #:nodoc:
-          logger.info "--> Replace '#{@regex}' with '#{@text}' in file #{@path}"
           "#{'sudo ' if option?(:sudo)}sed -i 's/#{@regex.gsub("'", "'\\\\''").gsub("/", "\\\\/").gsub("\n", '\n')}/#{@text.gsub("'", "'\\\\''").gsub("/", "\\\\/").gsub("\n", '\n')}/g' #{@path}"
         end
 

data/lib/sprinkle/installers/rpm.rb

@@ -10,6 +10,7 @@ module Sprinkle
     #
     #   package :magic_beans do
     #     rpm 'magic_beans'
+    #     verify { has_rpm 'magic_beans' }
     #   end
     #
     # You may also specify multiple rpms as an array:
@@ -17,13 +18,14 @@ module Sprinkle
     #   package :magic_beans do
     #     rpm %w(magic_beans magic_sauce)
     #   end
-    class Rpm < Installer
-      attr_accessor :packages #:nodoc:
+    class Rpm < PackageInstaller
 
-      def initialize(parent, packages, &block) #:nodoc:
-        super parent, &block
-        packages = [packages] unless packages.is_a? Array
-        @packages = packages
+      auto_api
+      
+      verify_api do
+        def has_rpm(package)
+          @commands << "rpm -qa | grep #{package}"
+        end
       end
 
       protected

data/lib/sprinkle/installers/runner.rb

@@ -1,18 +1,43 @@
 module Sprinkle
-	module Installers
-		class Runner < Installer
-			attr_accessor :cmd #:nodoc:
-
-			def initialize(parent, cmd, &block) #:nodoc:
-			  super parent, {}, &block
-				@cmd = cmd
-			end
-
-			protected
-				
-				def install_commands #:nodoc:
-					@cmd
-				end
-		end
-	end
+  module Installers
+    # The runner installer is great for running a simple command.
+    #
+    # == Example Usage
+    #
+    #   package :magic_beans do
+    #     runner "make world"
+    #   end
+    #
+    # You can also pass multiple commands as arguments or an array.
+    #
+    #   package :magic_beans do
+    #     runner "make world", "destroy world"
+    #     runner [ "make world", "destroy world" ]
+    #   end
+    #
+    class Runner < Installer
+      
+      api do
+        def runner(*cmds, &block)
+          options = cmds.extract_options!
+          install Sprinkle::Installers::Runner.new(self, cmds, options, &block)
+        end
+      end
+      
+      attr_accessor :cmds #:nodoc:
+      def initialize(parent, cmds, options = {}, &block) #:nodoc:
+        super parent, options, &block
+        @cmds = [*cmds].flatten
+        raise "you need to specify a command" if cmds.nil?
+      end
+      
+      protected
+        
+        def install_commands #:nodoc:
+          sudo_cmd ? 
+            @cmds.map { |cmd| "#{sudo_cmd}#{cmd}"} :
+            @cmds
+        end
+    end
+  end
 end

data/lib/sprinkle/installers/smart.rb

@@ -1,12 +1,11 @@
 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
+    class Smart < PackageInstaller
+      
+      api do
+        def smart(*names, &block)
+          install Sprinkle::Installers::Smart.new(self, *names, &block)
+        end
       end
 
       protected
@@ -16,14 +15,4 @@ module 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

@@ -62,24 +62,40 @@ module Sprinkle
     #     end
     #   end
     #
+    # Fifth, specifying a custom directory where the archive actually is extracted to:
+    #
+    #   package :ruby_build do
+    #     source 'https://github.com/sstephenson/ruby-build/archive/v20130227.tar.gz' do
+    #       custom_dir 'ruby-build-20130227'
+    #       custom_install './install.sh'
+    #     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:
+      
+      api do
+        def source(source, options = {}, &block)
+          @recommends << :build_essential # Ubuntu/Debian
+          install Sprinkle::Installers::Source.new(self, source, options, &block)
+        end
+      end
 
       def initialize(parent, source, options = {}, &block) #:nodoc:
-        @source = source
         super parent, options, &block
+        @source = source
+      end
+      
+      def install_sequence #:nodoc:
+        prepare + download + extract + configure + build + install
       end
 
       protected
 
-        def install_sequence #:nodoc:
-          prepare + download + extract + configure + build + install
-        end
-
         %w( prepare download extract configure build install ).each do |stage|
           define_method stage do
             pre_commands(stage.to_sym) + self.send("#{stage}_commands") + post_commands(stage.to_sym)
@@ -97,11 +113,7 @@ module Sprinkle
         end
 
         def download_commands #:nodoc:
-          if File.exist? @source
-            [ "cp #{@source} #{@options[:archives].first}/#{archive_name}" ]
-          else
-            [ "wget -cq -O '#{@options[:archives].first}/#{archive_name}' #{@source}" ]
-          end
+          [ "wget -cq -O '#{@options[:archives].first}/#{archive_name}' #{@source}" ]
         end
 
         def extract_commands #:nodoc:

data/lib/sprinkle/installers/thor.rb

@@ -20,6 +20,13 @@ module Sprinkle
     #   end
      
     class Thor < Installer
+      
+      api do
+        def thor(name, options = {}, &block)
+          install Sprinkle::Installers::Thor.new(self, name, options, &block)
+        end  
+      end
+      
       def initialize(parent, commands, options = {}, &block) #:nodoc:
         super parent, options, &block
         @commands = commands

data/lib/sprinkle/installers/transfer.rb

@@ -84,16 +84,46 @@ module Sprinkle
     # directories or changing permissions), you can use the pre/post :install directives
     # and they will be run.
     class Transfer < Installer
-      attr_accessor :source, :destination #:nodoc:
+      attr_accessor :source, :destination, :sourcepath #:nodoc:
+      
+      api do
+        def transfer(source, destination, options = {}, &block)
+          options.merge!(:binding => binding())
+          install Sprinkle::Installers::Transfer.new(self, source, destination, options, &block)
+        end
+      end
 
       def initialize(parent, source, destination, options={}, &block) #:nodoc:
-        super parent, options, &block
         @source = source
         @destination = destination
+        @orig_destination = destination
+        super parent, options, &block
+        @binding = options[:binding]
+        # perform the transfer in two steps if we're using sudo
+        if sudo?
+          final = @destination
+          @destination = "/tmp/sprinkle_#{File.basename(@destination)}"
+          post :install, "#{sudo_cmd}mv #{@destination} #{final}"
+        end
+        owner(options[:owner]) if options[:owner]
+        mode(options[:mode]) if options[:mode]
+
+        options[:render]=true if source_is_template?
+        options[:recursive]=false if options[:render]
+      end
+      
+      def owner(owner)
+        @owner = owner
+        post :install, "#{sudo_cmd}chown #{owner} #{@orig_destination}"
+      end
+      
+      def mode(mode)
+        @mode = mode
+        post :install, "#{sudo_cmd}chmod #{mode} #{@orig_destination}"
       end
 
       def install_commands
-        nil
+        :TRANSFER
       end
 
       def self.render_template(template, context, prefix)
@@ -118,60 +148,51 @@ module Sprinkle
       end
 
       def render_template_file(path, context, prefix)
-        template = File.read(path)
+        template = source_is_template? ? path : File.read(path)
         tempfile = render_template(template, context, @package.name)
         tempfile
       end
+      
+      def source_is_template?
+        @source.split("\n").size>1
+      end
 
       def process(roles) #:nodoc:
         assert_delivery
 
-        if logger.debug?
-          logger.debug "transfer: #{@source} -> #{@destination} for roles: #{roles}\n"
-        end
+        logger.debug "transfer: #{@source} -> #{@destination} for roles: #{roles}\n"
 
-        unless Sprinkle::OPTIONS[:testing]
-          pre = pre_commands(:install)
-          unless pre.empty?
-            sequence = pre; sequence = sequence.join('; ') if sequence.is_a? Array
-            logger.info "#{@package.name} pre-transfer commands: #{sequence} for roles: #{roles}\n"
-            @delivery.process @package.name, [pre].flatten, roles
-          end
+        return if Sprinkle::OPTIONS[:testing]
 
-          recursive = @options[:recursive]
-
-          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
+        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
-            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
           else
-            sourcepath = @source
+            # context = binding()
+            context = @binding
           end
 
-          logger.info "--> Transferring #{sourcepath} to #{@destination} for roles: #{roles}"
-          @delivery.transfer(@package.name, sourcepath, @destination, roles, recursive)
-
-          post = post_commands(:install)
-          unless post.empty?
-            sequence = post; sequence = sequence.join('; ') if sequence.is_a? Array
-            logger.info "#{@package.name} post-transfer commands: #{sequence} for roles: #{roles}\n"
-            @delivery.process @package.name, [post].flatten, roles
+          tempfile = render_template_file(@source, context, @package.name)
+          @sourcepath = tempfile.path
+          if source_is_template?
+            logger.debug "Rendering inline template to temporary file #{sourcepath}"
+          else
+            logger.debug "Rendering template #{@source} to temporary file #{sourcepath}"
           end
+          recursive = false
+        else
+          @sourcepath = @source
         end
+
+        logger.debug "    --> Transferring #{sourcepath} to #{@orig_destination} for roles: #{roles}"
+        @delivery.install(self, roles, :recursive => @options[:recursive])
       end
     end
   end

data/lib/sprinkle/installers/user.rb

@@ -1,13 +1,43 @@
 module Sprinkle
   module Installers
+    # The user installer helps add users.  You may pass flags as an option.
+    # 
+    # == Example Usage
+    #
+    #   package :users do
+    #     add_user 'admin', :flags => "--disabled-password"
+    #
+    #     verify do
+    #       has_user 'admin', :in_group = "root"
+    #     end
+    #   end
+    
     class User < Installer
-      def initialize(package, username, options, &block)
-        super package, &block
+      
+      api do
+        def add_user(username, options={},  &block)
+          install Sprinkle::Installers::User.new(self, username, options, &block)
+        end
+      end
+      
+      verify_api do
+        def has_user(user, opts = {})
+          if opts[:in_group]
+            @commands << "id -nG #{user} | xargs -n1 echo | grep #{opts[:in_group]}"
+          else
+            @commands << "id #{user}"
+          end
+        end
+      end
+      
+      def initialize(package, username, options = {}, &block) #:nodoc:
+        super package, options, &block
         @username = username
-        @options = options
       end
+      
       protected 
-      def install_commands
+      
+      def install_commands #:nodoc:
         "adduser #{@options[:flags]} #{@username}"
       end
     end

data/lib/sprinkle/installers/yum.rb

@@ -1,7 +1,5 @@
 module Sprinkle
   module Installers
-    # = Yum Package Installer
-    #
     # The Yum package installer installs RPM packages.
     # 
     # == Example Usage
@@ -10,20 +8,22 @@ module Sprinkle
     #
     #   package :magic_beans do
     #     yum 'magic_beans'
+    #     verify { has_yum 'magic_beans' }
     #   end
     #
-    # You may also specify multiple rpms as an array:
+    # You may also specify multiple rpms as arguments or an array:
     #
     #   package :magic_beans do
-    #     yum %w(magic_beans magic_sauce)
+    #     yum "magic_beans", "magic_sauce"
     #   end
-    class Yum < Installer
-      attr_accessor :packages #:nodoc:
+    class Yum < PackageInstaller
+
+      auto_api
 
-      def initialize(parent, packages, &block) #:nodoc:
-        super parent, &block
-        packages = [packages] unless packages.is_a? Array
-        @packages = packages
+      verify_api do
+        def has_yum(package)
+          @commands << "yum list installed #{package} | grep ^#{package}"
+        end
       end
 
       protected