nesquena-cap-recipes 0.3.16 → 0.3.17

data/README.textile

@@ -1,19 +1,24 @@
 h1. cap-recipes
 
-A collection of useful capistrano recipes.
-Best suited for ruby projects which deploy using Phusion Passenger.
+A collection of useful capistrano recipes I have been using in production on a number of sites.
 
-Feel free to contribute to this and make it better!
+This gem is best suited for ruby (and rails) projects which deploy using Apache and Phusion Passenger.
+Feel free to contribute to this collection and make it even better! 
+
+The overall vision for this project being to collect a number of classic, generic recipes which can
+be used by the community.
 
 Currently included:
 
  * Apache Server
+ * Rubygems Package Management
  * Phusion Passenger (Setup and Deployment)
  * Memcache Process (Setup and Deployment)
  * Juggernaut Daemon
  * Backgroundrb Server
  * DelayedJob Worker
  * Whenever Cron Scheduling
+ * Aptitude Package Management 
 
 h2. INSTALLATION
 
@@ -23,15 +28,16 @@ Include into your deploy.rb configuration file for Capistrano:
 
 <pre>
 <code>
-  # use the complete deployment process
+  # use the complete deployment process (NOT RECOMMENDED)
   require 'cap_recipes'
 
-  # OR
-  # use a single slice of the deployment process
+  # RECOMMENDED
+  # require necessary recipes according to your needs
   # (use hooks which tie all the recipes into the deployment process,
   # tasks for managing and tasks for installing):
-  # substitute memcache with: passenger, rails, apache, backgroundrb, delayed_job, juggernaut, whenever
   require 'cap_recipes/tasks/memcache'
+  require 'cap_recipes/tasks/passenger'
+  # or rails, apache, rubygems, delayed_job, juggernaut, backgroundrb, aptitude, whenever
 
   # OR
   # only use managing tasks:
@@ -66,6 +72,24 @@ h5. install.rb
 
   apache
     :install
+  
+h3. Rubygems
+
+h4. Configuration
+
+  * rubygem_paths - a path or array of paths to your gem binaries [default '/usr/bin/gem' ]
+
+h4. Tasks
+
+h5. manage.rb
+
+  rubygems
+    :full_update
+    :upgrade
+    :update
+    :cleanup
+    :install
+    :uninstall
 
 h3. Passenger
 
@@ -73,7 +97,7 @@ These recipes manage the passenger module for apache
 
 h4. Configuration
 
- * base_ruby_path - the base path to the ruby installation [default: "/usr"]
+ * base_ruby_path - the base path to the ruby installation [default: '/usr']
  * local_ping_path - the localhost path to ping to start passenger [default: "http://localhost"]
 
 The following files and folders are expected to exist:
@@ -96,6 +120,17 @@ h5. install.rb
  passenger
    :install
 
+h3. Aptitude
+
+h4. Tasks
+
+h5. manage.rb
+
+  aptitude
+    :install
+    :remove
+    :updates
+
 h3. Rails
 
 These recipes support rails-specific functionality

data/Rakefile

@@ -10,7 +10,7 @@ begin
     s.summary = %Q{Battle-tested capistrano recipes for passenger, delayed_job, and more}
     s.email = "nesquena@gmail.com"
     s.homepage = "http://github.com/nesquena/cap-recipes"
-    s.description = "Battle-tested capistrano recipes for passenger, apache, delayed_job, juggernaut, backgroundrb, rails and more"
+    s.description = "Battle-tested capistrano recipes for debian, passenger, apache, delayed_job, juggernaut, rubygems, backgroundrb, rails and more"
     s.authors = ["Nathan Esquenazi"]
   end
 rescue LoadError

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 3
-:patch: 16
+:patch: 17

data/cap-recipes.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cap-recipes}
-  s.version = "0.3.16"
+  s.version = "0.3.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
-  s.date = %q{2009-06-02}
-  s.description = %q{Battle-tested capistrano recipes for passenger, apache, delayed_job, juggernaut, backgroundrb, rails and more}
+  s.date = %q{2009-06-07}
+  s.description = %q{Battle-tested capistrano recipes for debian, passenger, apache, delayed_job, juggernaut, rubygems, backgroundrb, rails and more}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -24,6 +24,8 @@ Gem::Specification.new do |s|
      "lib/cap_recipes/tasks/apache.rb",
      "lib/cap_recipes/tasks/apache/install.rb",
      "lib/cap_recipes/tasks/apache/manage.rb",
+     "lib/cap_recipes/tasks/aptitude.rb",
+     "lib/cap_recipes/tasks/aptitude/manage.rb",
      "lib/cap_recipes/tasks/backgroundrb.rb",
      "lib/cap_recipes/tasks/backgroundrb/hooks.rb",
      "lib/cap_recipes/tasks/backgroundrb/manage.rb",
@@ -43,10 +45,12 @@ Gem::Specification.new do |s|
      "lib/cap_recipes/tasks/rails.rb",
      "lib/cap_recipes/tasks/rails/hooks.rb",
      "lib/cap_recipes/tasks/rails/manage.rb",
+     "lib/cap_recipes/tasks/rubygems.rb",
+     "lib/cap_recipes/tasks/rubygems/manage.rb",
+     "lib/cap_recipes/tasks/utilities.rb",
      "lib/cap_recipes/tasks/whenever.rb",
      "lib/cap_recipes/tasks/whenever/hooks.rb",
      "lib/cap_recipes/tasks/whenever/manage.rb",
-     "lib/cap_recipes/tasks/with_scope.rb",
      "spec/cap/all/Capfile",
      "spec/cap/helper.rb",
      "spec/cap_recipes_spec.rb",

data/lib/cap_recipes/tasks/aptitude/manage.rb

@@ -0,0 +1,34 @@
+require 'cap_recipes/tasks/utilities.rb'
+
+Capistrano::Configuration.instance(true).load do
+  namespace :aptitude do
+    desc "Updates all installed packages on apt-get package system"
+    task :updates do
+      sudo "apt-get -qy update"
+      sudo "apt-get -qy upgrade"
+      sudo "apt-get -qy autoremove"
+    end
+
+    desc "Installs a specified apt-get package"
+    task :install do
+      puts "What is the name of the package(s) you wish to install?"
+      deb_pkg_name = $stdin.gets.chomp
+      raise "Please specify deb_pkg_name" if deb_pkg_name == ''
+      logger.info "Updating packages..."
+      sudo "aptitude update"
+      logger.info "Installing #{deb_pkg_name}..."
+      utilities.sudo_with_input "apt-get install #{deb_pkg_name}", /^Do you want to continue\?/
+    end
+
+    desc "Removes a specified apt-get package"
+    task :remove do
+      puts "What is the name of the package(s) you wish to install?"
+      deb_pkg_name = $stdin.gets.chomp
+      raise "Please specify deb_pkg_name" if deb_pkg_name == ''
+      logger.info "Updating packages..."
+      sudo "aptitude update"
+      logger.info "Removing #{deb_pkg_name}..."
+      utilities.sudo_with_input "apt-get remove --purge #{deb_pkg_name}", /^Do you want to continue\?/
+    end
+  end
+end

data/lib/cap_recipes/tasks/aptitude.rb

@@ -0,0 +1 @@
+Dir[File.join(File.dirname(__FILE__), 'aptitude/*.rb')].sort.each { |lib| require lib }

data/lib/cap_recipes/tasks/delayed_job/manage.rb

@@ -7,21 +7,21 @@ Capistrano::Configuration.instance(true).load do
   namespace :delayed_job do
     desc "Start delayed_job process"
     task :start, :roles => delayed_job_role do
-      with_role(delayed_job_role) do
+      utilities.with_role(delayed_job_role) do
         try_sudo "#{base_ruby_path}/bin/ruby #{delayed_script_path} start #{delayed_job_env}"
       end
     end
 
     desc "Stop delayed_job process"
     task :stop, :roles => delayed_job_role do
-      with_role(delayed_job_role) do
+      utilities.with_role(delayed_job_role) do
         try_sudo "#{base_ruby_path}/bin/ruby #{delayed_script_path} stop #{delayed_job_env}"
       end
     end
 
     desc "Restart delayed_job process"
     task :restart, :roles => delayed_job_role do
-      with_role(delayed_job_role) do
+      utilities.with_role(delayed_job_role) do
         delayed_job.stop
         sleep(4)
         try_sudo "killall -s TERM delayed_job; true"

data/lib/cap_recipes/tasks/juggernaut/manage.rb

@@ -13,7 +13,7 @@ Capistrano::Configuration.instance(true).load do
 
     desc "Starts the juggernaut push server"
     task :start, :roles => juggernaut_role do
-      with_role(juggernaut_role) do
+      utilities.with_role(juggernaut_role) do
         puts "Starting juggernaut push server"
         try_sudo "#{base_ruby_path}/bin/juggernaut -c #{juggernaut_config} -d --pid #{juggernaut_pid} --log #{juggernaut_log}"
       end
@@ -21,7 +21,7 @@ Capistrano::Configuration.instance(true).load do
 
     desc "Stops the juggernaut push server"
     task :stop, :roles => juggernaut_role do
-      with_role(juggernaut_role) do
+      utilities.with_role(juggernaut_role) do
         puts "Stopping juggernaut push server"
         try_sudo "#{base_ruby_path}/bin/juggernaut -c #{juggernaut_config} -k * --pid #{juggernaut_pid} --log #{juggernaut_log}"
       end
@@ -29,7 +29,7 @@ Capistrano::Configuration.instance(true).load do
 
     desc "Restarts the juggernaut push server"
     task :restart, :roles => juggernaut_role do
-      with_role(juggernaut_role) do
+      utilities.with_role(juggernaut_role) do
         juggernaut.stop
         juggernaut.start
       end

data/lib/cap_recipes/tasks/memcache/manage.rb

@@ -7,7 +7,7 @@ Capistrano::Configuration.instance(true).load do
 
     desc "Stops the memcache server"
     task :stop, :roles => memcache_role do
-      with_role(memcache_role) do
+      utilities.with_role(memcache_role) do
         puts "Stopping the memcache server"
         try_sudo "killall -s TERM memcached; true"
       end
@@ -15,7 +15,7 @@ Capistrano::Configuration.instance(true).load do
 
     desc "Starts the memcache server"
     task :start, :roles => memcache_role do
-      with_role(memcache_role) do
+      utilities.with_role(memcache_role) do
         puts "Starting the memcache server"
         try_sudo "nohup /etc/init.d/memcached start"
       end
@@ -23,7 +23,7 @@ Capistrano::Configuration.instance(true).load do
 
     desc "Restarts the memcache server"
     task :restart, :roles => memcache_role do
-      with_role(memcache_role) do
+      utilities.with_role(memcache_role) do
         puts "Restarting the memcache server"
         memcache.stop
         sleep(3)  # sleep for 3 seconds to make sure the server has mopped up everything

data/lib/cap_recipes/tasks/passenger/install.rb

@@ -1,4 +1,4 @@
-require 'cap_recipes/tasks/with_scope.rb'
+require 'cap_recipes/tasks/utilities.rb'
 
 #TODO add something like require that a task named apache:restart exists
 Capistrano::Configuration.instance(true).load do
@@ -41,22 +41,22 @@ Capistrano::Configuration.instance(true).load do
       apache.restart
     end
 
-# if you want to add more options, try this, in your own conifg
-# read this first... http://www.modrails.com/documentation/Users%20guide.html
-#    namespace :passenger do
-#      task :add_custom_configuration, :roles=>:web do
-#        #512 - 100(stack) - 4*100(instance)
-#        passenger_config = <<EOF
-#    PassengerMaxPoolSize 4
-#    PassengerPoolIdleTime 3000
-#    EOF
-#        put passenger_config, "/tmp/passenger"
-#        sudo "cat /tmp/passenger >> /etc/apache2/conf.d/passenger"
-#        apache.restart
-#      end
-#    end
-#    after "passenger:update_config", *%w(
-#      passenger:add_custom_configuration
-#    )
+    # if you want to add more options, try this, in your own conifg
+    # read this first... http://www.modrails.com/documentation/Users%20guide.html
+    #    namespace :passenger do
+    #      task :add_custom_configuration, :roles=>:web do
+    #        #512 - 100(stack) - 4*100(instance)
+    #        passenger_config = <<EOF
+    #    PassengerMaxPoolSize 4
+    #    PassengerPoolIdleTime 3000
+    #    EOF
+    #        put passenger_config, "/tmp/passenger"
+    #        sudo "cat /tmp/passenger >> /etc/apache2/conf.d/passenger"
+    #        apache.restart
+    #      end
+    #    end
+    #    after "passenger:update_config", *%w(
+    #      passenger:add_custom_configuration
+    #    )
   end
 end

data/lib/cap_recipes/tasks/passenger/manage.rb

@@ -1,4 +1,4 @@
-require 'cap_recipes/tasks/with_scope.rb'
+require 'cap_recipes/tasks/utilities.rb'
 
 Capistrano::Configuration.instance(true).load do
   namespace :deploy do

data/lib/cap_recipes/tasks/rails/hooks.rb

@@ -1,4 +1,4 @@
-require 'cap_recipes/tasks/with_scope.rb'
+require 'cap_recipes/tasks/utilities.rb'
 
 Capistrano::Configuration.instance(true).load do
   after "deploy:update_code", "rails:symlink_db_config" # copy database.yml file to release path

data/lib/cap_recipes/tasks/rails/manage.rb

@@ -1,4 +1,4 @@
-require 'cap_recipes/tasks/with_scope.rb'
+require 'cap_recipes/tasks/utilities.rb'
 
 Capistrano::Configuration.instance(true).load do
   set :local_ping_path, 'http://localhost'
@@ -8,14 +8,14 @@ Capistrano::Configuration.instance(true).load do
     # UTILITY TASKS
     # ===============================================================
     desc "Symlinks the shared/config/database yaml to release/config/"
-    task :symlink_db_config, :roles => :web do
+    task :symlink_db_config, :roles => :app do
       puts "Copying database configuration to release path"
       try_sudo "rm #{release_path}/config/database.yml -f"
       try_sudo "ln -s #{shared_path}/config/database.yml #{release_path}/config/database.yml"
     end
 
     desc "Repair permissions to allow user to perform all actions"
-    task :repair_permissions, :roles => :web do
+    task :repair_permissions, :roles => :app do
       puts "Applying correct permissions to allow for proper command execution"
       try_sudo "chmod -R 744 #{current_path}/log #{current_path}/tmp"
       try_sudo "chown -R #{user}:#{user} #{current_path}"
@@ -23,12 +23,12 @@ Capistrano::Configuration.instance(true).load do
     end
 
     desc "Displays the production log from the server locally"
-    task :tail, :roles => :web do
+    task :tail, :roles => :app do
       stream "tail -f #{shared_path}/log/production.log"
     end
 
     desc "Pings localhost to startup server"
-    task :ping, :roles => :web do
+    task :ping, :roles => :app do
       puts "Pinging the web server to start it"
       run "wget -O /dev/null #{local_ping_path} 2>/dev/null"
     end
@@ -38,13 +38,13 @@ Capistrano::Configuration.instance(true).load do
     # ===============================================================
     namespace :sweep do
       desc "Clear file-based fragment and action caching"
-      task :log, :roles => :web  do
+      task :log, :roles => :app  do
         puts "Sweeping all the log files"
         run "cd #{current_path} && #{sudo} rake log:clear RAILS_ENV=production"
       end
 
       desc "Clear file-based fragment and action caching"
-      task :cache, :roles => :web do
+      task :cache, :roles => :app do
         puts "Sweeping the fragment and action cache stores"
         run "cd #{release_path} && #{sudo} rake tmp:cache:clear RAILS_ENV=production"
       end

data/lib/cap_recipes/tasks/rubygems/manage.rb

@@ -0,0 +1,43 @@
+Capistrano::Configuration.instance(true).load do
+  set :rubygem_paths, '/usr/bin/gem'
+  
+  namespace :rubygems do
+    desc "Performs a rubygems upgrade, updates all gems and cleans up old ones"
+    task :full_update, :roles => :app do
+      rubygems.upgrade
+      rubygems.update
+      rubygems.cleanup
+    end
+
+    desc "Upgrades the rubygem package installation"
+    task :upgrade, :roles => :app do
+      Array(rubygem_paths).each { |path| sudo "#{path} update --system" }
+    end
+
+    desc "Updates all installed gems"
+    task :update, :roles => :app do
+      Array(rubygem_paths).each { |path| sudo "#{path} update" }
+    end
+
+    desc "Removes old gems which are now outdated"
+    task :cleanup, :roles => :app do
+      Array(rubygem_paths).each { |path| sudo "#{path} cleanup" }
+    end
+
+    desc "Install a gem on your servers servers"
+    task :install, :roles => :app do
+      puts "Enter the name of the gem you'd like to install:"
+      gem_name = $stdin.gets.chomp
+      logger.info "trying to install '#{gem_name}'"
+      Array(rubygem_paths).each {|path| sudo "#{path} install #{gem_name} --no-ri --no-rdoc" }
+    end
+
+    desc "Uninstall a gem from the release servers"
+    task :uninstall, :roles => :app do
+      puts "Enter the name of the gem you'd like to remove:"
+      gem_name = $stdin.gets.chomp
+      logger.info "trying to remove '#{gem_name}'"
+      Array(rubygem_paths).each { |path| sudo "#{path} uninstall #{gem_name} -x" }
+    end
+  end
+end

data/lib/cap_recipes/tasks/rubygems.rb

@@ -0,0 +1 @@
+Dir[File.join(File.dirname(__FILE__), 'rubygems/*.rb')].sort.each { |lib| require lib }

data/lib/cap_recipes/tasks/utilities.rb

@@ -0,0 +1,113 @@
+require 'fileutils'
+ 
+module Utilities 
+  def config_gsub(file, find, replace)
+    tmp="/tmp/#{File.basename(file)}"
+    get file, tmp
+    content=File.open(tmp).read
+    content.gsub!(find,replace)
+    put content, tmp
+    sudo "mv #{tmp} #{file}"
+  end
+  
+  def sudo_upload(from, to, options={}, &block)
+    top.upload from, "/tmp/#{File.basename(to)}", options, &block
+    sudo "mv /tmp/#{File.basename(to)} #{to}"
+    sudo "chmod #{options[:mode]} #{to}" if options[:mode]
+    sudo "chown #{options[:owner]} #{to}" if options[:owner]
+  end
+  
+  def adduser(user, options={})
+    options[:shell] ||= '/bin/bash' # new accounts on ubuntu 6.06.1 have been getting /bin/sh
+    switches = '--disabled-password --gecos ""'
+    switches += " --shell=#{options[:shell]} " if options[:shell]
+    switches += ' --no-create-home ' if options[:nohome]
+    switches += " --ingroup #{options[:group]} " unless options[:group].nil?
+    invoke_command "grep '^#{user}:' /etc/passwd || sudo /usr/sbin/adduser #{user} #{switches}",
+    :via => run_method
+  end
+  
+  # role = :app
+  def with_role(role, &block)
+    original, ENV['HOSTS'] = ENV['HOSTS'], find_servers(:roles => role).map{|d| d.host}.join(",")
+    begin
+      yield
+    ensure
+      ENV['HOSTS'] = original
+    end
+  end
+
+  # options = { :user => 'xxxxx', :password => 'xxxxx' }
+  def with_credentials(options={}, &block)
+    original_username, original_password = user, password
+    begin
+      set :user,     options[:user] || original_username
+      set :password, options[:password] || original_password
+      yield
+    ensure
+      set :user,     original_username
+      set :password, original_password
+    end
+  end
+  
+  ##
+  # Run a command and ask for input when input_query is seen.
+  # Sends the response back to the server.
+  #
+  # +input_query+ is a regular expression that defaults to /^Password/.
+  #
+  # Can be used where +run+ would otherwise be used.
+  #
+  # run_with_input 'ssh-keygen ...', /^Are you sure you want to overwrite\?/
+ 
+  def run_with_input(shell_command, input_query=/^Password/, response=nil)
+    handle_command_with_input(:run, shell_command, input_query, response)
+  end
+ 
+  ##
+  # Run a command using sudo and ask for input when a regular expression is seen.
+  # Sends the response back to the server.
+  #
+  # See also +run_with_input+
+  #
+  # +input_query+ is a regular expression
+ 
+  def sudo_with_input(shell_command, input_query=/^Password/, response=nil)
+    handle_command_with_input(:sudo, shell_command, input_query, response)
+  end
+ 
+  def invoke_with_input(shell_command, input_query=/^Password/, response=nil)
+    handle_command_with_input(run_method, shell_command, input_query, response)
+  end
+  
+  private
+  
+  ##
+  # Does the actual capturing of the input and streaming of the output.
+  #
+  # local_run_method: run or sudo
+  # shell_command: The command to run
+  # input_query: A regular expression matching a request for input: /^Please enter your password/
+ 
+  def handle_command_with_input(local_run_method, shell_command, input_query, response=nil)
+    send(local_run_method, shell_command, {:pty => true}) do |channel, stream, data|
+      
+      if data =~ input_query
+        if response
+          logger.info "#{data} #{"*"*(rand(10)+5)}", channel[:host]
+          channel.send_data "#{response}\n"
+        else
+          logger.info data, channel[:host]
+          response = ::Capistrano::CLI.password_prompt "#{data}"
+          channel.send_data "#{response}\n"
+        end
+      else
+        logger.info data, channel[:host]
+      end
+    end
+  end
+  
+  
+end
+ 
+Capistrano.plugin :utilities, Utilities

data/lib/cap_recipes/tasks/whenever/manage.rb

@@ -1,4 +1,4 @@
-require 'cap_recipes/tasks/with_scope.rb'
+require 'cap_recipes/tasks/utilities.rb'
 
 Capistrano::Configuration.instance(true).load do
   namespace :whenever do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nesquena-cap-recipes
 version: !ruby/object:Gem::Version 
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 -07:00
+date: 2009-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: Battle-tested capistrano recipes for passenger, apache, delayed_job, juggernaut, backgroundrb, rails and more
+description: Battle-tested capistrano recipes for debian, passenger, apache, delayed_job, juggernaut, rubygems, backgroundrb, rails and more
 email: nesquena@gmail.com
 executables: []
 
@@ -33,6 +33,8 @@ files:
 - lib/cap_recipes/tasks/apache.rb
 - lib/cap_recipes/tasks/apache/install.rb
 - lib/cap_recipes/tasks/apache/manage.rb
+- lib/cap_recipes/tasks/aptitude.rb
+- lib/cap_recipes/tasks/aptitude/manage.rb
 - lib/cap_recipes/tasks/backgroundrb.rb
 - lib/cap_recipes/tasks/backgroundrb/hooks.rb
 - lib/cap_recipes/tasks/backgroundrb/manage.rb
@@ -52,10 +54,12 @@ files:
 - lib/cap_recipes/tasks/rails.rb
 - lib/cap_recipes/tasks/rails/hooks.rb
 - lib/cap_recipes/tasks/rails/manage.rb
+- lib/cap_recipes/tasks/rubygems.rb
+- lib/cap_recipes/tasks/rubygems/manage.rb
+- lib/cap_recipes/tasks/utilities.rb
 - lib/cap_recipes/tasks/whenever.rb
 - lib/cap_recipes/tasks/whenever/hooks.rb
 - lib/cap_recipes/tasks/whenever/manage.rb
-- lib/cap_recipes/tasks/with_scope.rb
 - spec/cap/all/Capfile
 - spec/cap/helper.rb
 - spec/cap_recipes_spec.rb

data/lib/cap_recipes/tasks/with_scope.rb

@@ -1,22 +0,0 @@
-# role = :app
-def with_role(role, &block)
-  original, ENV['HOSTS'] = ENV['HOSTS'], find_servers(:roles => role).map{|d| d.host}.join(",")
-  begin
-    yield
-  ensure
-    ENV['HOSTS'] = original
-  end
-end
-
-# options = { :user => 'xxxxx', :password => 'xxxxx' }
-def with_credentials(options={}, &block)
-  original_username, original_password = user, password
-  begin
-    set :user,     options[:user] || original_username
-    set :password, options[:password] || original_password
-    yield
-  ensure
-    set :user,     original_username
-    set :password, original_password
-  end
-end