sunshine 1.2.0 → 1.2.1

data/History.txt

@@ -1,3 +1,29 @@
+=== 1.2.1 / 2010-10-05
+
+* Improvements:
+
+  * Added customizable behaviors for sigint and failures during deploys.
+
+  * Added Sunshine irb shell to work directly with deploying apps.
+
+  * Added ability to launch a pseudo terminal from a RemoteShell.
+
+  * Added exit code to CmdError.
+
+  * Added exclude paths for checkout by copy.
+
+* Bugfixes:
+
+  * Fixed custom scripts.
+
+  * Fixed deploy env defaults.
+
+  * Removed Shell#update_timeout as it was unnecessary.
+
+  * RemoteShell rsync recurses by default.
+
+  * Fixed start and stop script permissions when calling sunshine commands.
+
 === 1.2.0 / 2010-09-08
 
 * Improvements:

data/Manifest.txt

@@ -46,6 +46,7 @@ lib/sunshine/repos/rsync_repo.rb
 lib/sunshine/repos/svn_repo.rb
 lib/sunshine/server_app.rb
 lib/sunshine/shell.rb
+lib/sunshine/trap_stack.rb
 templates/apache/apache.conf.erb
 templates/mongrel_rails/mongrel_rails.conf.erb
 templates/nginx/nginx.conf.erb

data/bin/sunshine

@@ -1,5 +1,12 @@
 #!/usr/bin/env ruby -w
 
-require 'sunshine'
+begin
+  require 'sunshine'
+rescue LoadError => e
+  raise e unless e.message =~ %r{no such file to load -- sunshine}
+
+  $: << File.join(File.dirname(__FILE__), "../lib")
+  require 'sunshine'
+end
 
 Sunshine.run

data/lib/commands/list.rb

@@ -16,6 +16,7 @@ module Sunshine
   #   -f, --format FORMAT      Set the output format (txt, yml, json)
   #   -u, --user USER          User to use for remote login. Use with -r
   #   -r, --remote svr1,svr2   Run on one or more remote servers.
+  #   -S, --sudo               Run remote commands using sudo or sudo -u USER
   #   -v, --verbose            Run in verbose mode.
 
   class ListCommand < DefaultCommand
@@ -176,7 +177,11 @@ module Sunshine
 
     def status(*app_names)
       each_app(*app_names) do |server_app|
-        server_app.status
+        begin
+          server_app.status
+        rescue => e
+          e.message
+        end
       end
     end
 
@@ -185,17 +190,17 @@ module Sunshine
     # Runs a command and returns the status for each app_name:
     #   status_after_command 'restart', ['app1', 'app2']
 
-    def status_after_command cmd, app_names
+    def status_after_command cmd, app_names, options=nil
       each_app(*app_names) do |server_app|
 
         yield(server_app) if block_given?
 
         begin
-          server_app.run_script cmd
-          server_app.running? ? 'running' : 'down'
+          server_app.run_script! cmd, options
+          server_app.status.to_s
 
         rescue CmdError => e
-          raise "Failed running #{cmd}: #{server_app.status}"
+          raise "Failed running #{cmd}: #{server_app.status rescue :not_found}"
         end
       end
     end
@@ -268,7 +273,7 @@ module Sunshine
     # Load the app list yaml file from the server.
 
     def self.load_list server
-      yml_list = server.call "cat #{Sunshine::APP_LIST_PATH} || echo ''"
+      yml_list = server.call "cat #{Sunshine::APP_LIST_PATH} || echo"
 
       list = YAML.load yml_list
       list = {} unless Hash === list

data/lib/commands/restart.rb

@@ -9,10 +9,11 @@ module Sunshine
   #     app_name     Name of the application to restart.
   #
   # Options:
-  #     -f, --format FORMAT        Set the output format (txt, yml, json)
-  #     -u, --user USER            User to use for remote login. Use with -r.
-  #     -r, --remote svr1,svr2     Run on one or more remote servers.
-  #     -v, --verbose              Run in verbose mode.
+  #   -f, --format FORMAT        Set the output format (txt, yml, json)
+  #   -u, --user USER            User to use for remote login. Use with -r.
+  #   -r, --remote svr1,svr2     Run on one or more remote servers.
+  #   -S, --sudo                 Run remote commands using sudo or sudo -u USER
+  #   -v, --verbose              Run in verbose mode.
 
   class RestartCommand < ListCommand
 
@@ -38,7 +39,7 @@ module Sunshine
     # Restart specified apps.
 
     def restart app_names
-      status_after_command :restart, app_names
+      status_after_command :restart, app_names, :sudo => false
     end
 
 

data/lib/commands/rm.rb

@@ -9,11 +9,12 @@ module Sunshine
   #     app_name      Name of the application to remove.
   #
   # Options:
-  #     -d, --delete               Delete the app directory.
-  #     -f, --format FORMAT        Set the output format (txt, yml, json)
-  #     -u, --user USER            User to use for remote login. Use with -r.
-  #     -r, --remote svr1,svr2     Run on one or more remote servers.
-  #     -v, --verbose              Run in verbose mode.
+  #   -d, --delete               Delete the app directory.
+  #   -f, --format FORMAT        Set the output format (txt, yml, json)
+  #   -u, --user USER            User to use for remote login. Use with -r.
+  #   -r, --remote svr1,svr2     Run on one or more remote servers.
+  #   -S, --sudo                 Run remote commands using sudo or sudo -u USER
+  #   -v, --verbose              Run in verbose mode.
 
   class RmCommand < ListCommand
 

data/lib/commands/script.rb

@@ -10,10 +10,11 @@ module Sunshine
   #     app_name     Name of the application to run script for.
   #
   # Options:
-  #     -f, --format FORMAT        Set the output format (txt, yml, json)
-  #     -u, --user USER            User to use for remote login. Use with -r.
-  #     -r, --remote svr1,svr2     Run on one or more remote servers.
-  #     -v, --verbose              Run in verbose mode.
+  #   -f, --format FORMAT        Set the output format (txt, yml, json)
+  #   -u, --user USER            User to use for remote login. Use with -r.
+  #   -r, --remote svr1,svr2     Run on one or more remote servers.
+  #   -S, --sudo                 Run remote commands using sudo or sudo -u USER
+  #   -v, --verbose              Run in verbose mode.
 
   class ScriptCommand < ListCommand
 

data/lib/commands/start.rb

@@ -9,11 +9,12 @@ module Sunshine
   #     app_name     Name of the application to start.
   #
   # Options:
-  #     -F, --force                Stop apps that are running, then start them.
-  #     -f, --format FORMAT        Set the output format (txt, yml, json)
-  #     -u, --user USER            User to use for remote login. Use with -r.
-  #     -r, --remote svr1,svr2     Run on one or more remote servers.
-  #     -v, --verbose              Run in verbose mode.
+  #   -F, --force                Stop apps that are running, then start them.
+  #   -f, --format FORMAT        Set the output format (txt, yml, json)
+  #   -u, --user USER            User to use for remote login. Use with -r.
+  #   -r, --remote svr1,svr2     Run on one or more remote servers.
+  #   -S, --sudo                 Run remote commands using sudo or sudo -u USER
+  #   -v, --verbose              Run in verbose mode.
 
   class StartCommand < ListCommand
 
@@ -41,7 +42,7 @@ module Sunshine
     # Start specified apps.
 
     def start app_names, force=false
-      status_after_command :start, app_names do |server_app|
+      status_after_command :start, app_names, :sudo => false do |server_app|
 
         server_app.stop if server_app.running? && force
       end

data/lib/commands/stop.rb

@@ -9,10 +9,11 @@ module Sunshine
   #     app_name     Name of the application to stop.
   #
   # Options:
-  #     -f, --format FORMAT        Set the output format (txt, yml, json)
-  #     -u, --user USER            User to use for remote login. Use with -r.
-  #     -r, --remote svr1,svr2     Run on one or more remote servers.
-  #     -v, --verbose              Run in verbose mode.
+  #   -f, --format FORMAT        Set the output format (txt, yml, json)
+  #   -u, --user USER            User to use for remote login. Use with -r.
+  #   -r, --remote svr1,svr2     Run on one or more remote servers.
+  #   -S, --sudo                 Run remote commands using sudo or sudo -u USER
+  #   -v, --verbose              Run in verbose mode.
 
   class StopCommand < ListCommand
 
@@ -38,7 +39,7 @@ module Sunshine
     # Stop specified apps.
 
     def stop app_names
-      status_after_command :stop, app_names
+      status_after_command :stop, app_names, :sudo => false
     end
 
     ##

data/lib/sunshine.rb

@@ -11,6 +11,12 @@ require 'optparse'
 require 'time'
 require 'fileutils'
 require 'tmpdir'
+require 'irb'
+
+
+# Turn off EOF tracking to be able to prompt on deploy exceptions.
+HighLine.track_eof = false
+
 
 ##
 # Main module, used for configuration and running commands.
@@ -19,7 +25,7 @@ module Sunshine
 
   ##
   # Sunshine version.
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 
   ##
   # Path to the list of installed sunshine apps.
@@ -36,18 +42,16 @@ module Sunshine
   ##
   # Default configuration.
   DEFAULT_CONFIG = {
-    'auto'                => false,
+    'interactive'         => true,
     'auto_dependencies'   => true,
-    'deploy_env'          =>
-      ( ENV['DEPLOY_ENV'] ||
-        ENV['env']        ||
-        ENV['RACK_ENV']   ||
-        ENV['RAILS_ENV']  ||
-        :development ),
+    'deploy_env'          => :development,
+    'exception_behavior'  => :revert,
+    'exclude_paths'       => [],
     'level'               => 'info',
     'max_deploy_versions' => 5,
     'remote_checkouts'    => false,
     'timeout'             => 300,
+    'sigint_behavior'     => :revert,
     'web_directory'       => '/srv/http'
   }
 
@@ -113,11 +117,34 @@ module Sunshine
 
 
   ##
-  # Should sunshine ever ask for user input? True by default; overridden with
-  # the -a option.
+  # Defines what to do when deploy raises an exception.
+  # Supported values are:
+  #   ::revert:  Revert to the previous deploy.
+  #   ::console: Start an interactive ruby shell within the app's context.
+  #   ::exit:    Stop deploy and exit, leaving deploy in unfinished state.
+  #   ::prompt:  Ask what to do.
+  # Defaults to :revert. Overridden in the config.
+
+  def self.exception_behavior
+    @config['exception_behavior']
+  end
+
+
+  ##
+  # Array of paths or globs that should be excluded from the checkout.
+  # Does not work with remote_checkouts enabled.
+
+  def self.exclude_paths
+    @config['exclude_paths']
+  end
+
+
+  ##
+  # Should sunshine ever ask for user input? True by default.
+  # Overridden in the config or with the -a option.
 
   def self.interactive?
-    !@config['auto']
+    @config['interactive']
   end
 
 
@@ -155,6 +182,20 @@ module Sunshine
   end
 
 
+  ##
+  # Defines what to do when sigint is sent during deploys.
+  # Supported values are:
+  #   ::revert:  Revert to the previous deploy.
+  #   ::console: Start an interactive ruby shell within the app's context.
+  #   ::exit:    Stop deploy and exit, leaving deploy in unfinished state.
+  #   ::prompt:  Ask what to do.
+  # Defaults to :revert. Overridden in the config.
+
+  def self.sigint_behavior
+    @config['sigint_behavior']
+  end
+
+
   ##
   # How long to wait on a command to finish when no output is received.
   # Defaults to 300 (seconds). Overridden in the config.
@@ -186,42 +227,6 @@ module Sunshine
   end
 
 
-  ##
-  # Adds an INT signal trap with its description on the stack.
-  # Returns a trap_item Array.
-
-  def self.add_trap desc, &block
-    trap_item = [desc, block]
-    (@trap_stack ||= []).unshift trap_item
-    trap_item
-  end
-
-  add_trap "Disconnecting all remote shells." do
-    RemoteShell.disconnect_all
-  end
-
-
-  ##
-  # Call a trap item and display it's message.
-
-  def self.call_trap trap_item
-    return unless trap_item
-
-    msg, block = trap_item
-
-    logger.info :INT, msg do
-      block.call
-    end
-  end
-
-
-  ##
-  # Remove a trap_item from the stack.
-
-  def self.delete_trap trap_item
-    @trap_stack.delete trap_item
-  end
-
 
   ##
   # Global value of sudo to use. Returns true, nil, or a username.
@@ -264,6 +269,15 @@ module Sunshine
     end
 
     load_config_file USER_CONFIG_FILE
+
+    @config['deploy_env'] =
+      ENV['DEPLOY_ENV'] ||
+      ENV['env']        ||
+      ENV['RACK_ENV']   ||
+      ENV['RAILS_ENV']  ||
+      @config['deploy_env']
+
+    @config
   end
 
 
@@ -282,15 +296,18 @@ module Sunshine
   def self.setup new_config={}, reset=false
     @config = DEFAULT_CONFIG.dup if reset
 
-    trap "INT" do
+    TrapStack.trap_signal :INT do |msg|
       $stderr << "\n\n"
       logger.indent = 0
       logger.fatal :INT, "Caught INT signal!"
+      logger.info :INT, msg
+    end
 
-      call_trap @trap_stack.shift
-      exit 1
+    TrapStack.add_trap "Disconnecting all remote shells." do
+      RemoteShell.disconnect_all
     end
 
+
     require_libs(*new_config['require'])
 
     config.merge! new_config
@@ -369,6 +386,7 @@ module Sunshine
 
 
   require 'sunshine/exceptions'
+  require 'sunshine/trap_stack'
 
   require 'sunshine/shell'
   require 'sunshine/remote_shell'

data/lib/sunshine/app.rb

@@ -176,6 +176,8 @@ module Sunshine
 
       @deploy_name = options[:deploy_name] || Time.now.to_i.to_s
 
+      @deploy_env = options[:deploy_env] if options[:deploy_env]
+
       set_deploy_paths options[:root_path]
 
       @server_apps = server_apps_from_config options[:remote_shells]
@@ -192,7 +194,7 @@ module Sunshine
 
       @post_user_lambdas = []
 
-      @has_session = false
+      @on_sigint = @on_exception = nil
     end
 
 
@@ -220,7 +222,8 @@ module Sunshine
 
 
     ##
-    # Check if server apps are connected. Supports any App#find options.
+    # Check if all server apps are connected and returns a boolean.
+    # Supports any App#find options.
 
     def connected? options=nil
       each options do |server_app|
@@ -231,6 +234,19 @@ module Sunshine
     end
 
 
+    ##
+    # Check if any server apps are connected and returns a boolean.
+    # Supports any App#find options.
+
+    def any_connected? options=nil
+      each options do |server_app|
+        return true if server_app.shell.connected?
+      end
+
+      false
+    end
+
+
     ##
     # Disconnect server apps. Supports any App#find options.
 
@@ -247,6 +263,13 @@ module Sunshine
     # Deploy the application to deploy servers and
     # call user's post-deploy code. Supports any App#find options.
     #
+    # If the deploy fails or an exception is raised, it will attempt to
+    # run the Sunshine.failed_deploy_behavior, which is set to :revert by
+    # default. However, this is not true of ssh connection failures.
+    #
+    # If the deploy is interrupted by a SIGINT, it will attempt to run
+    # the Sunshine.sigint_behavior, which is set to :revert by default.
+    #
     # Note: The deploy method will stop the former deploy just before
     # symlink and the passed block is run.
     #
@@ -254,28 +277,28 @@ module Sunshine
     # run App#start.
 
     def deploy options=nil
-      success = false
-      prev_connection = connected?
 
-      deploy_trap = Sunshine.add_trap "Reverting deploy of #{@name}" do
-        revert! options
-        start options
-        disconnect options unless prev_connection
-      end
+      state = {
+        :success   => false,
+        :stopped   => false,
+        :symlinked => false
+      }
 
-      Sunshine.logger.info :app, "Beginning deploy of #{@name}"
+      Sunshine.logger.info :app, "Beginning #{@name} deploy"
 
-      with_session options do
+      with_session options do |app|
+
+        interruptable state do
+          raise DeployError, "No servers defined for #{@name}" if
+            @server_apps.empty?
 
-        with_filter options do |app|
           make_app_directories
           checkout_codebase
 
-          stop
-
-          symlink_current_dir
+          state[:stopped]   = true if stop
+          state[:symlinked] = true if symlink_current_dir
 
-          yield(self) if block_given?
+          yield self if block_given?
 
           run_post_user_lambdas
 
@@ -287,29 +310,136 @@ module Sunshine
 
           register_as_deployed
 
-          success = start :force => true
-
-          remove_old_deploys
-          success &&= deployed?
+          state[:success] = true if start! :force => true
         end
+
+        remove_old_deploys if state[:success] rescue
+          Sunshine.logger.error :app, "Could not remove old deploys"
+
+        state[:success] &&= deployed?
       end
 
-      Sunshine.logger.info :app, "Ending deploy of #{@name}"
+      Sunshine.logger.info :app, "Finished #{@name} deploy" if state[:success]
+      state[:success]
+    end
 
-    rescue => e
-      message = "#{e.class}: #{e.message}"
 
-      Sunshine.logger.error :app, message do
+    ##
+    # Handles SIGINTs and exceptions according to rules set by
+    # Sunshine.sigint_behavior and Sunshine.exception_behavior
+    # or with the override hooks App#on_sigint and App#on_exception.
+
+    def interruptable options={}
+      interrupt_trap =
+        TrapStack.add_trap "Interrupted #{@name}" do
+          handle_sigint options
+        end
+
+      yield if block_given?
+
+    rescue => e
+      Sunshine.logger.error :app, "#{e.class}: #{e.message}" do
         Sunshine.logger.error '>>', e.backtrace.join("\n")
-        revert! options
-        start options
       end
 
+      handle_exception e, options
+
     ensure
-      disconnect options unless prev_connection
-      Sunshine.delete_trap deploy_trap
+      TrapStack.delete_trap interrupt_trap
+    end
+
+
+    ##
+    # Calls the Apps on_sigint hook or the default Sunshine.sigint_behavior.
 
-      success
+    def handle_sigint state={}
+      return @on_sigint.call(state) if @on_sigint
+      handle_interruption Sunshine.sigint_behavior, state
+    end
+
+
+    ##
+    # Calls the Apps on_exception hook or the default
+    # Sunshine.exception_behavior.
+
+    def handle_exception exception, state={}
+      return @on_exception.call(exception, state) if @on_exception
+      handle_interruption Sunshine.exception_behavior, state
+    end
+
+
+    ##
+    # Set this to define the behavior of SIGINT during a deploy.
+    # Defines what to do when an INT signal is received when running
+    # a proc through App#interruptable. Used primarily to catch SIGINTs
+    # during deploys. Passes the block a hash with the state of the deploy:
+    #
+    #   app.on_sigint do |deploy_state_hash|
+    #     deploy_state_hash
+    #     #=> {:stopped => true, :symlinked => true, :success => false}
+    #   end
+
+    def on_sigint &block
+      @on_sigint = block
+    end
+
+
+    ##
+    # Set this to define the behavior of exceptions during a deploy.
+    # Defines what to do when an exception is received when running
+    # a proc through App#interruptable. Used primarily to catch exceptions
+    # during deploys. Passes the block the exception and a hash with the
+    # state of the deploy:
+    #
+    #   app.on_exception do |exception, deploy_state_hash|
+    #     # do something...
+    #   end
+
+    def on_exception &block
+      @on_exception = block
+    end
+
+
+    ##
+    # Handles the behavior of a failed or interrupted deploy.
+    # Takes a behavior symbol defining how to handle the interruption
+    # and a hash representing the state of the deploy when it was
+    # interrupted.
+    #
+    # Supported bahavior symbols are:
+    # ::revert:   Revert to previous deploy (default)
+    # ::console:  Start an interactive console with the app's binding
+    # ::exit:     Stop deploy and exit
+    # ::prompt:   Ask what to do
+    #
+    # The state hash supports the following keys:
+    # ::stopped:    Was the previous deploy stopped.
+    # ::symlinked:  Was the new deployed symlinked as the current deploy.
+
+    def handle_interruption behavior, state={}
+      case behavior
+
+      when :exit
+        Sunshine.exit 1, "Error: Deploy of #{@name} failed"
+
+      when :revert
+        revert! if state[:symlinked]
+        start   if state[:stopped]
+
+      when Sunshine.interactive? && :console
+        self.console!
+
+      when Sunshine.interactive? && :prompt
+        Sunshine.shell.choose do |menu|
+          menu.prompt = "Deploy interrupted:"
+          menu.choice(:revert) { handle_interruption :revert,  state }
+          menu.choice(:console){ handle_interruption :console, state }
+          menu.choice(:exit)   { handle_interruption :exit, state }
+        end
+
+      else
+        raise DeployError, "Deploy of #{@name} was interrupted."
+      end
     end
 
 
@@ -343,7 +473,7 @@ module Sunshine
     # application and job name, including previous deploys.
 
     def add_to_crontab name, cronjob, options=nil
-      with_server_apps options do |server_app|
+      each options do |server_app|
         server_app.crontab[name] << cronjob
       end
     end
@@ -357,7 +487,7 @@ module Sunshine
     # application and job name, including previous deploys.
 
     def cronjob name, cronjob, options=nil
-      with_server_apps options do |server_app|
+      each options do |server_app|
         server_app.crontab[name] = cronjob
       end
     end
@@ -369,7 +499,7 @@ module Sunshine
     #   add_to_script :start, "start_mail", :role => :mail
 
     def add_to_script name, script, options=nil
-      with_server_apps options do |server_app|
+      each options do |server_app|
         server_app.scripts[name] << script
       end
     end
@@ -432,13 +562,44 @@ module Sunshine
     end
 
 
+    ##
+    # Starts an IRB console with the instance's binding.
+
+    def console!
+      IRB.setup nil unless defined?(IRB::UnrecognizedSwitch)
+
+      workspace = IRB::WorkSpace.new binding
+      irb = IRB::Irb.new workspace
+
+      irb.context.irb_name = "sunshine(#{@name})"
+      irb.context.prompt_c = "%N:%03n:%i* "
+      irb.context.prompt_i = "%N:%03n:%i> "
+      irb.context.prompt_n = "%N:%03n:%i> "
+
+      IRB.class_eval do
+        @CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
+        @CONF[:MAIN_CONTEXT] = irb.context
+      end
+
+      #TODO: remove sigint trap when irb session is closed
+      #trap("INT") do
+      #  irb.signal_handle
+      #end
+
+      catch(:IRB_EXIT) do
+        irb.eval_input
+      end
+    end
+
+
     ##
     # Checks out the app's codebase to one or all deploy servers.
     # Supports all App#find options, plus:
     # :copy:: Bool - Checkout locally and rsync; defaults to false.
 
     def checkout_codebase options=nil
-      copy_option = options && options.has_key?(:copy) && options[:copy]
+      copy_option = options[:copy]          if options
+      exclude     = options.delete(:exclude) if options
 
       if @remote_checkout && !copy_option
         with_server_apps options,
@@ -451,13 +612,13 @@ module Sunshine
           tmp_path = File.join Sunshine::TMP_DIR, "#{@name}_checkout"
           scm_info = @repo.checkout_to tmp_path
 
+          scm_info[:exclude] =
+            [Sunshine.exclude_paths, exclude].flatten.compact
+
           with_server_apps options,
             :send => [:upload_codebase, tmp_path, scm_info]
         end
       end
-
-    rescue => e
-      raise CriticalDeployError, e
     end
 
 
@@ -612,9 +773,6 @@ module Sunshine
       with_server_apps options,
         :msg  => "Creating #{@name} directories",
         :send => :make_app_directories
-
-    rescue => e
-      raise FatalDeployError, e
     end
 
 
@@ -692,6 +850,18 @@ module Sunshine
     end
 
 
+    ##
+    # Run the restart script of a deployed app on the specified
+    # deploy servers. Raises an exception on failure.
+    # Post-deploy only.
+
+    def restart! options=nil
+      with_server_apps options,
+        :msg  => "Running restart script",
+        :send => :restart!
+    end
+
+
     ##
     # Runs bundler on deploy servers.
 
@@ -699,9 +869,6 @@ module Sunshine
       with_server_apps options,
         :msg  => "Running Bundler",
         :send => [:run_bundler, options]
-
-    rescue => e
-      raise CriticalDeployError, e
     end
 
 
@@ -712,9 +879,6 @@ module Sunshine
       with_server_apps options,
         :msg  => "Running GemInstaller",
         :send => [:run_geminstaller, options]
-
-    rescue => e
-      raise CriticalDeployError, e
     end
 
 
@@ -741,6 +905,18 @@ module Sunshine
     end
 
 
+    ##
+    # Run the given script of a deployed app on the specified
+    # deploy servers. Raises an exception on failure.
+    # Post-deploy only.
+
+    def run_script! name, options=nil
+      with_server_apps options,
+        :msg  => "Running #{name} script",
+        :send => [:run_script!, name, options]
+    end
+
+
     ##
     # Run a sass task on any or all deploy servers.
 
@@ -763,6 +939,8 @@ module Sunshine
       @shell_env.merge!(env_hash)
 
       with_server_apps :all,
+        :no_threads => true,
+        :no_session => true,
         :msg => "Shell env: #{@shell_env.inspect}" do |server_app|
         server_app.shell_env.merge!(@shell_env)
       end
@@ -783,6 +961,18 @@ module Sunshine
     end
 
 
+    ##
+    # Run the start script of a deployed app on the specified
+    # deploy servers. Raises an exception on failure.
+    # Post-deploy only.
+
+    def start! options=nil
+      with_server_apps options,
+        :msg  => "Running start script",
+        :send => [:start!, options]
+    end
+
+
     ##
     # Get a hash of which deploy server apps are :running or :down.
     # Post-deploy only.
@@ -810,12 +1000,26 @@ module Sunshine
     end
 
 
+    ##
+    # Run the stop script of a deployed app on the specified
+    # deploy servers. Raises an exception on failure.
+    # Post-deploy only.
+
+    def stop! options=nil
+      with_server_apps options,
+        :msg  => "Running stop script",
+        :send => :stop!
+    end
+
+
     ##
     # Use sudo on deploy servers. Set to true/false, or
     # a username to use 'sudo -u'.
 
     def sudo=(value)
       with_server_apps :all,
+        :no_threads => true,
+        :no_session => true,
         :msg => "Using sudo = #{value.inspect}" do |server_app|
         server_app.shell.sudo = value
       end
@@ -831,9 +1035,6 @@ module Sunshine
       with_server_apps options,
         :msg  => "Symlinking #{@checkout_path} -> #{@current_path}",
         :send => :symlink_current_dir
-
-    rescue => e
-      raise CriticalDeployError, e
     end
 
 
@@ -916,6 +1117,7 @@ module Sunshine
     # a session to avoid multiple ssh login prompts. Supports all App#find
     # options, plus:
     # :no_threads:: bool - disable threaded execution
+    # :no_session:: bool - disable auto session creation
     # :msg:: "some message" - log message
     #
     #   app.with_server_apps :all, :msg => "doing something" do |server_app|
@@ -925,12 +1127,16 @@ module Sunshine
     #   app.with_server_apps :role => :db, :user => "bob" do |server_app|
     #     # do something here
     #   end
+    #
+    # Note: App#with_server_apps calls App#with_session. If you do not need
+    # or want a server connection you can pass :no_session.
 
     def with_server_apps search_options, options={}
       options = search_options.merge options if Hash === search_options
 
       message = options[:msg]
       method  = options[:no_threads] ? :each : :threaded_each
+      auto_session = !options[:no_session]
 
       block = lambda do
         send(method, search_options) do |server_app|
@@ -945,7 +1151,7 @@ module Sunshine
       end
 
 
-      with_session options do
+      msg_block = lambda do
         if message
           Sunshine.logger.info(:app, message, &block)
 
@@ -953,6 +1159,8 @@ module Sunshine
           block.call
         end
       end
+
+      auto_session ? with_session(&msg_block) : msg_block.call
     end
 
 
@@ -960,16 +1168,22 @@ module Sunshine
     # Runs block ensuring a connection to remote_shells.
     # Connecting and disconnecting will be ignored if a session
     # already exists. Supports all App#find options.
+    #
+    # Ensures that servers are disconnected after the block is run
+    # if servers were not previously connected.
 
     def with_session options=nil
+      with_filter options do
+        prev_connection = connected?
 
-      prev_connection = connected?(options)
-      connect options unless prev_connection
+        begin
+          connect unless prev_connection
+          yield self
 
-      yield
-
-    ensure
-      disconnect options unless prev_connection
+        ensure
+          disconnect unless prev_connection
+        end
+      end
     end