sprinkle 0.7.4 → 0.7.5

data/CHANGELOG.md

@@ -1,7 +1,11 @@
+*   Lots of sudo fixes
+
+    *Various people*
+
 *   Default package options (see Package docs)
 
     *Koen Punt*
-    
+
 *   Add the file installer so we can stop doing templates with `transfer`
 
     *Josh Goebel*
@@ -9,22 +13,22 @@
 *   Officially depreciate transfer :render and the ability to render just by passing
     a multi-line string as the transfer source.  If you want to render templates see the
     new `render()` and `template()` (rendering.rb) helpers and the `file` installer.
-    
+
     *Josh Goebel*
 
 *   A users own post :install hooks should happen after a file has completely been moved
     (when using sudo this was not the case)
-    
+
     *Koen Punt*
 
-*   Remove the Deployment module from Object.  
+*   Remove the Deployment module from Object.
 
-    If anyone is relying on the behavior of placing their deployment block in a required 
+    If anyone is relying on the behavior of placing their deployment block in a required
     file then they will first need to manually add the module back to the Object class
     themselves.  Polluting Object is generally bad.
 
     *Josh Goebel*
-    
+
 *   Add support for specifying the Net::SSH keys property
 
     *Chris Kimpton*
@@ -34,17 +38,17 @@
     *Stefano Diem Benatti*
 
 *   Sprinkle `sudo_cmd` and Capistrino should work together instead of getting in each others way
-    
+
     When using the capistrano actor `sudo_cmd` will now use the capistrano
     generated sudo command and therefore automatically deal with password
-    prompts, etc.  This should fix hangs when installers try to call `sudo` on 
+    prompts, etc.  This should fix hangs when installers try to call `sudo` on
     the other side of a pipe operation and capistrano can not recognize the
     password prompt.
 
 *   Sprinkle executable should return an error code if there was a failure
 
     *Michael Nigh*
-    
+
 *   verify of local actor was never returning false so installers would never be executed
 
     *Edgars Beigarts*
@@ -54,13 +58,13 @@
     should `capify .` your setup and move your deploy.rb file into the config
     folder.  Or you can provide a block with `recipe 'deploy'` to force the
     old behavior.
-    
+
     *Josh Goebel*
-    
+
 *   Capistrano actor now uses the configured setting of `run_method`, instead of always sudo.
-    The default Capistrano setup prefers sudo, so nothing should change for 
-    most users.  If you want to NOT use sudo to run commands you can set 
+    The default Capistrano setup prefers sudo, so nothing should change for
+    most users.  If you want to NOT use sudo to run commands you can set
     `use_sudo` or `run_method` accordingly in your capistrano recipes:
     `set :use_sudo, false` or `set :run_method, :run`
-    
+
     *Michael Nigh*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sprinkle (0.7.3)
+    sprinkle (0.7.4)
       activesupport (>= 2.0.2)
       capistrano (>= 2.5.5)
       erubis (>= 2.7.0)
@@ -28,7 +28,7 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     builder (3.0.4)
-    capistrano (2.15.4)
+    capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -45,11 +45,11 @@ GEM
     json (1.8.0)
     method_source (0.8.1)
     multi_json (1.7.7)
-    net-scp (1.1.1)
+    net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.7)
+    net-ssh (2.6.8)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     open4 (1.3.0)
@@ -79,14 +79,14 @@ GEM
     rake (10.1.0)
     rdoc (3.10)
       json (~> 1.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.1)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
+    rspec-mocks (2.14.3)
     sdoc (0.3.20)
       json (>= 1.1.3)
       rdoc (~> 3.10)

data/lib/sprinkle.rb

@@ -17,11 +17,28 @@ def require_all(*args) # :nodoc:
     Dir[File.dirname(__FILE__) + "/sprinkle/#{f}"].each { |e| require e } }
 end
 
-require_all "version.rb", "extensions/*.rb", "verifiers/*.rb", "installers/*.rb"
+require     'sprinkle/version'
+
+require_all "extensions/*.rb"
+
+require     'sprinkle/package'
+require     'sprinkle/verify'
+require     'sprinkle/installers/installer'
+require     'sprinkle/installers/package_installer'
+require_all "verifiers/*.rb", "installers/*.rb"
 
 module Sprinkle
   # Configuration options
   OPTIONS = { :testing => false, :verbose => false, :force => false }
+
+  module Logger
+    def logger # :nodoc:
+      # ActiveSupport::BufferedLogger was deprecated and replaced by ActiveSupport::Logger in Rails 4.
+      # Use ActiveSupport::Logger if available.
+      active_support_logger = defined?(ActiveSupport::Logger) ? ActiveSupport::Logger : ActiveSupport::BufferedLogger
+      @@__log__ ||= active_support_logger.new($stdout, active_support_logger::Severity::INFO)
+    end
+  end
 end
 
 # Object is extended with a few helper methods.  Please see Sprinkle::Core.
@@ -29,12 +46,5 @@ end
 # Define a logging target and understand packages, policies and deployment DSL
 #++
 class Object
-  include Sprinkle::Package, Sprinkle::Core
-
-  def logger # :nodoc:
-    # ActiveSupport::BufferedLogger was deprecated and replaced by ActiveSupport::Logger in Rails 4.
-    # Use ActiveSupport::Logger if available.
-    active_support_logger = defined?(ActiveSupport::Logger) ? ActiveSupport::Logger : ActiveSupport::BufferedLogger
-    @@__log__ ||= active_support_logger.new($stdout, active_support_logger::Severity::INFO)
-  end
+  include Sprinkle::Package, Sprinkle::Core, Sprinkle::Logger
 end

data/lib/sprinkle/actors/capistrano.rb

@@ -21,6 +21,7 @@ module Sprinkle
       attr_accessor :config, :loaded_recipes #:nodoc:
 
       def initialize(&block) #:nodoc:
+        @installer = nil
         @config = ::Capistrano::Configuration.new
         @config.logger.level = Sprinkle::OPTIONS[:verbose] ? ::Capistrano::Logger::INFO : ::Capistrano::Logger::IMPORTANT
         @config.set(:password) { ::Capistrano::CLI.password_prompt }
@@ -32,7 +33,7 @@ module Sprinkle
         end
 
         if block
-          @config.instance_eval &block
+          @config.instance_eval(&block)
         else
           @config.load "Capfile" if File.exist?("Capfile")
         end

data/lib/sprinkle/actors/dummy.rb

@@ -8,7 +8,7 @@ module Sprinkle
       def initialize(&block) #:nodoc:
         # @config.set(:_sprinkle_actor, self)
         @roles={}
-        self.instance_eval &block
+        self.instance_eval(&block)
       end
 
       def role(role, server, opts={})
@@ -23,7 +23,7 @@ module Sprinkle
       end
       
       def install(installer, roles, opts={})
-        if per_host=opts.delete(:per_host)
+        if self.per_host=opts.delete(:per_host)
           servers_per_role(roles).each do |server|
             installer.reconfigure_for(server)
             installer.announce
@@ -54,4 +54,4 @@ module Sprinkle
       end
     end
   end
-end
+end

data/lib/sprinkle/actors/local.rb

@@ -68,8 +68,8 @@ module Sprinkle
       
       def run_command(cmd) #:nodoc:
         @log_recorder.reset cmd
-        pid, stdin, out, err = Open4.popen4(cmd)
-        ignored, status = Process::waitpid2 pid
+        pid, _, out, err = Open4.popen4(cmd)
+        _, status = Process::waitpid2 pid
         @log_recorder.log :err, err.read
         @log_recorder.log :out, out.read
         @log_recorder.code = status.to_i
@@ -80,13 +80,11 @@ module Sprinkle
       end
       
       def transfer(source, destination, roles, opts ={}) #:nodoc:
-			  opts.reverse_merge!(:recursive => true)
-				flags = "-R " if opts[:recursive]
-				
-				run_command "cp #{flags}#{source} #{destination}"
-			end
-      
-      
+        opts.reverse_merge!(:recursive => true)
+        flags = "-R " if opts[:recursive]
+
+        run_command "cp #{flags}#{source} #{destination}"
+      end
     end
   end
 end

data/lib/sprinkle/actors/ssh.rb

@@ -49,7 +49,7 @@ module Sprinkle
       def initialize(options = {}, &block) #:nodoc:
         @options = options.update(:user => 'root', :port => 22)
         @roles = {}
-        self.instance_eval &block if block
+        self.instance_eval(&block) if block
         raise "You must define at least a single role." if @roles.empty?
       end
 
@@ -119,9 +119,9 @@ module Sprinkle
       
       def verify(verifier, roles) #:nodoc:
         # issue all the verification steps in a single SSH command
-        commands=[verifier.commands.join(" && ")]
+        commands=[prepare_commands(verifier.commands).join(" && ")]
         process(verifier.package.name, commands, roles)
-      rescue SSHCommandFailure => e
+      rescue SSHCommandFailure
         false
       end
       
@@ -146,8 +146,8 @@ module Sprinkle
       
         def execute_on_role(commands, role) #:nodoc:
           hosts = @roles[role]
-          Array(hosts).each do |host| 
-            success = execute_on_host(commands, host)
+          Array(hosts).each do |host|
+            execute_on_host(commands, host)
           end
         end
         

data/lib/sprinkle/deployment.rb

@@ -48,6 +48,7 @@ module Sprinkle
 
       def initialize(&block) #:nodoc:
         @defaults = {}
+        @style = nil
         self.instance_eval(&block)
         raise 'No delivery mechanism defined' unless @style
       end
@@ -60,7 +61,7 @@ module Sprinkle
       def delivery(type, &block) #:doc:
         type=type.to_s.titleize
         type="SSH" if type=="Ssh"
-        @style = ("Sprinkle::Actors::" + type).constantize.new &block
+        @style = ("Sprinkle::Actors::" + type).constantize.new(&block)
       end
 
       def method_missing(sym, *args, &block) #:nodoc:

data/lib/sprinkle/extensions/sudo.rb

@@ -1,13 +1,17 @@
 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?)
+      sudo_stack.detect { |x| x==true or x==false }
+    end
+
+    def sudo_stack
+      [ options[:sudo], package.sudo?, @delivery.try(:sudo?) ]
     end
-    
+
   end
-end
+end

data/lib/sprinkle/installers/installer.rb

@@ -2,27 +2,27 @@ module Sprinkle
   # Installers are where the bulk of the work in Sprinkle happens.  Installers are
   # the building blocks of packages.  Typically each unique type of install
   # command has it's own installer class.
-  # 
+  #
   module Installers
     # The base class which all installers must subclass, this class makes
     # sure all installers share some general features, which are outlined
-    # below. 
+    # below.
     #
     # = Pre/Post Installation Hooks
-    # 
+    #
     # With all installation methods you have the ability to specify multiple
     # pre/post installation hooks. This gives you the ability to specify
-    # commands to run before and after an installation takes place. 
+    # commands to run before and after an installation takes place.
     # There are three ways to specify a pre/post hook.
-    
+
     # Note about sudo:
     # When using the Capistrano actor all commands by default are run using
-    # sudo (unless your Capfile includes "set :use_sudo, false").  If you wish 
-    # to use sudo periodically with "set :user_sudo, false" or with an actor 
-    # other than Capistrano then you can just append it to your command. Some 
-    # installers (transfer) also support a :sudo option, so check each 
+    # sudo (unless your Capfile includes "set :use_sudo, false").  If you wish
+    # to use sudo periodically with "set :user_sudo, false" or with an actor
+    # other than Capistrano then you can just append it to your command. Some
+    # installers (transfer) also support a :sudo option, so check each
     # installer for details.
-    # 
+    #
     # First, a single command:
     #
     #   pre :install, 'echo "Hello, World!"'
@@ -49,42 +49,43 @@ module Sprinkle
     # Some installation methods actually grant you more fine grained
     # control of when commands are run rather than a blanket pre :install
     # or post :install. If this is the case, it will be documented on
-    # the installation method's corresponding documentation page. 
+    # the installation method's corresponding documentation page.
     class Installer
       include Sprinkle::Attributes
       include Sprinkle::Sudo
-      
+
       delegate :version, :to => :package
-      
+
       attr_accessor :delivery, :package, :options, :pre, :post #:nodoc:
 
       def initialize(package, options = {}, &block) #:nodoc:
         @package = package
         @options = options || {}
         @pre = {}; @post = {}
+        @delivery = nil
         self.instance_eval(&block) if block
       end
-            
+
       attributes :prefix, :archives, :builds
-      
+
       class << self
         def subclasses
           @subclasses ||= []
         end
-        
+
         def api(&block)
-          Sprinkle::Package::Package.add_api &block
+          Sprinkle::Package::Package.add_api(&block)
         end
-        
+
         def verify_api(&block)
-          Sprinkle::Verify.class_eval &block
+          Sprinkle::Verify.class_eval(&block)
         end
 
         def inherited(base)
           subclasses << base
         end
       end
-            
+
       def escape_shell_arg(str)
         str.gsub("'", "'\\\\''").gsub("\n", '\n')
       end
@@ -92,24 +93,31 @@ module Sprinkle
       def pre(stage, *commands, &block)
         @pre[stage] ||= []
         @pre[stage] += commands
-        @pre[stage] += commands_from_block(block)
+        @pre[stage] << defer(block) if block_given?
+        @pre[stage]
       end
 
       def post(stage, *commands, &block)
         @post[stage] ||= []
         @post[stage] += commands
-        @post[stage] += commands_from_block(block) 
+        @post[stage] << defer(block) if block_given?
+        @post[stage]
       end
-      
+
+      # defer execution of command block until the package is being
+      # processed
+      def defer(block)
+        p = Proc.new { self.commands_from_block(block) }
+      end
+
       def commands_from_block(block)
         return [] unless block
         out = nil
-        diff = @package.with_private_install_queue do
-          out = block.call
-        end
+        diff = @package.with_private_install_queue { out = block.call }
+        diff.each {|x| x.delivery = self.delivery }
         diff.empty? ? out : diff.map {|x| x.install_sequence }
       end
-      
+
       def method_missing(method, *args, &block)
         if package.class.installer_methods.include?(method)
           @package.send(method, *args, &block)
@@ -117,12 +125,11 @@ module Sprinkle
           super(method, *args, &block)
         end
       end
-      
+
       def per_host?
         return false
-        @per_host
       end
-      
+
       # Called right before an installer is exected, can be used for logging
       # and announcing what is about to happen
       def announce; end
@@ -144,17 +151,21 @@ module Sprinkle
         # command sequence construction (eg. source based installer).
         def install_sequence
           commands = pre_commands(:install) + [ install_commands ] + post_commands(:install)
-          commands.flatten
+          flatten commands
         end
-        
+
       protected
-      
-        def log(t, level=:info)
+
+        def log(t, level=:info) #:nodoc:
           logger.send(level, t)
         end
 
+        def flatten(commands) #:nodoc:
+          commands.flatten.map {|c| c.is_a?(Proc) ? c.call : c }.flatten
+        end
+
         # A concrete installer (subclass of this virtual class) must override this method
-        # and return the commands it needs to run as either a string or an array. 
+        # and return the commands it needs to run as either a string or an array.
         #
         # <b>Overriding this method is required.</b>
         def install_commands
@@ -171,9 +182,9 @@ module Sprinkle
 
         # Concrete installers (subclasses of this virtual class) can override this method to
         # specify stage-specific (pre-installation, post-installation, etc.) modifications
-        # of commands. 
+        # of commands.
         #
-        # An example usage of overriding this would be to prefix all commands for a 
+        # An example usage of overriding this would be to prefix all commands for a
         # certain stage to change to a certain directory. An example is given below:
         #
         #   def dress(commands, stage)