recap 0.2.0 → 1.0.0

data/lib/recap.rb

@@ -1,12 +1,121 @@
+# This is the documentation for [recap](https://github.com/freerange/recap), a simple, opinionated
+# set of capistrano deployment recipes.
+#
+# Inspired in part by
+# [this blog post](https://github.com/blog/470-deployment-script-spring-cleaning), these recipes use
+# git's strengths to deploy applications in a faster, simpler manner than the standard capistrano
+# deployment.
+#
+# ### Aims and features
+#
+# Releases are managed using git.  All code is deployed to a single directory, and git tags are
+# used to manage different released versions.  No `releases`, `current` or `shared` directories are
+# created, avoiding unnecessary sym-linking.  For more information on how releases work, see
+# [recap/tasks/deploy.rb](recap/tasks/deploy.html).
+#
+# Deployments do the minimum work possible, using git to determine whether tasks need to run.  e.g.
+# the `bundle:install` task only runs if the app contains a `Gemfile.lock` file and it has changed
+# since the last deployment.  You can see how this works in
+# [recap/tasks/bundler.rb](recap/tasks/bundler.html).
+#
+# Applications have their own user and group, owning all of that application's associated
+# files and processes.  This gives them a dedicated environment, allowing environment variables to
+# be used for application specific configuration.  Tasks such as `env`, `env:set` and `env:edit` make
+# setting and changing these variables easy.  [recap/tasks/env.rb](recap/tasks/env.html) has more
+# information about using these environment variables.
+#
+# Personal accounts are used to deploy to the server, distinct from the application user.  The right
+# to deploy an application is granted simply by adding a user to the application group.  Most tasks
+# are run as the application user using `sudo su...`.  To avoid having to enter a password when
+# running them, these lines can be added to `/etc/sudoers.d/application`
+# (change `application` to the name of your app).
+#
+# <pre>%application ALL=NOPASSWD: /sbin/start application*
+# %application ALL=NOPASSWD: /sbin/stop application*
+# %application ALL=NOPASSWD: /sbin/restart application*
+# %application ALL=NOPASSWD: /bin/su - application*
+# %application ALL=NOPASSWD: /bin/su application*</pre>
+#
+# ### Limitations and Constraints
+#
+# Recap has been developed and tested using Ubuntu 11.04. It may work well with
+# other flavours of unix, but proceed with caution.
+#
+# Recap also uses a different file layout than other capistrano-based deployments, so other
+# recipes may not work well with it.  You can improve compatibility with other recipes using
+# [recap/support/compatibility.rb](recap/support/compatibility.html).
+#
+# ### Getting started
+#
+# To use recap you'll need a project stored in `git`.  You'll also need a server with `git` installed
+# and if deploying a rails or ruby app, `bundler` and `ruby` too.  Finally you need an account on the
+# server which you can SSH into and which is a sudoer.
+#
+# #### Preparing your project
+#
+# To get a project ready to deploy with recap, you'll need to install the gem, most likely by adding
+# an entry like the following to the `Gemfile`, then running `bundle install`.
+#
+# <pre>gem 'recap', '~>1.0.0'</pre>
+#
+# Once the gem is installed, generate a `Capfile` by running `recap setup` within your project
+# folder.  You can see the supported options with `recap help setup`.  The generated `Capfile`
+# will look something like this:
+#
+# <pre>require 'recap/recipes/rails'
+#
+# set :application, 'example-app'
+# set :repository, 'git@example.com:example/example-app.git'
+#
+# server 'server.example.com', :app</pre>
+#
+# Edit the `Capfile` to point at your deployment server and your project should be ready.  `cap -T`
+# will show all the tasks now available.
+#
+# #### Preparing the server
+#
+# The next step is setting up the server.  Running `cap bootstrap` will check your personal account
+# on the server is configured correctly, and add an account for your application.
+#
+# This application account is dedicated to your app, so you can edit its `.profile` as much as you
+# need (to add a particular version of `ruby` to the path, for example).
+# [recap/tasks/env.rb](recap/tasks/env.html) information on how to use the `env:set` and `env:edit`
+# tasks to set configuration variables.
+#
+# #### Preparing the app
+#
+# Running `cap deploy:setup` clones your code and sets up everything ready for the first deployment.
+# Once this has been run, you might want to set up a virtual host entry for nginx or Apache to
+# point at your app.
+#
+# #### Deploying
+#
+# Finally running `cap deploy` will deploy your app for the first time.  Each time you make a change
+# you want deployed, commit and push your changes to your `git` repository, and run `cap deploy` to
+# push those changes to the server.
+#
+# ### Further information
+#
+# Recap has recipes to deploy static, ruby-based and rails apps which you can find out about in
+# [recap/recipes](recap/recipes.html).
+#
+# For more information about all the capistrano tasks recap provides, see
+# [recap/tasks](recap/tasks.html).
+#
+# ### Versioning and License ###
+#
+# recap uses [semantic versioning](http://semver.org/).
+# The code is available [on github](https://github.com/freerange/recap) and released under the
+# [MIT License](https://github.com/freerange/recap/blob/master/LICENSE)
+
 module Recap
-  autoload :Namespace, 'recap/namespace'
+  module Support
+    autoload :Compatibility, 'recap/support/compatibility'
+    autoload :Namespace, 'recap/support/namespace'
+    autoload :Environment, 'recap/support/environment'
+    autoload :ShellCommand, 'recap/support/shell_command'
+    autoload :CLI, 'recap/support/cli'
+  end
 
-  autoload :Bootstrap, 'recap/bootstrap'
-  autoload :Bundler, 'recap/bundler'
-  autoload :Compatibility, 'recap/compatibility'
-  autoload :Deploy, 'recap/deploy'
-  autoload :Env, 'recap/env'
-  autoload :Environment, 'recap/environment'
-  autoload :Foreman, 'recap/foreman'
-  autoload :Rails, 'recap/rails'
-end
+  autoload :Version, 'recap/version'
+end

data/recap.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Recap::VERSION
   s.authors     = ["Tom Ward"]
   s.email       = ["tom@popdog.net"]
-  s.homepage    = "http://code.gofreerange.com/recap"
+  s.homepage    = "http://gofreerange.com/recap"
   s.summary     = %q{GIT based deployment recipes for Capistrano}
   s.description = %q{GIT based deployment recipes for Capistrano}
 
@@ -18,8 +18,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency('capistrano', '~>2.9.0')
   s.add_dependency('thor')
+  s.add_dependency('open4')
   s.add_development_dependency('rake', '~>0.9.2')
-  s.add_development_dependency('rocco', '~>0.8.1')
+  s.add_development_dependency('fl-rocco', '~>1.0.0')
   s.add_development_dependency('rspec', '~>2.7.0')
   s.add_development_dependency('mocha', '~>0.10.0')
   s.add_development_dependency('vagrant', '~>0.9.7')

data/spec/models/capistrano_extensions_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Recap::Support::CapistranoExtensions do
+  let :config do
+    Capistrano::Configuration.new
+  end
+
+  describe "#edit_file" do
+    before do
+      Tempfile.any_instance.stubs(:path).returns('path/to/tempfile')
+      config.stubs(:as_app)
+      Recap::Support::ShellCommand.stubs(:execute_interactive)
+      config.stubs(:get)
+      config.stubs(:editor).returns("some-editor")
+    end
+
+    it 'downloads the file to a temporary file for editing' do
+      config.expects(:get).with('remote/path/to/file', 'path/to/tempfile')
+      File.stubs(:read).with('path/to/tempfile')
+      config.edit_file('remote/path/to/file')
+    end
+
+    it 'opens the editor using `execute_interactive` so that Vi works' do
+      config.stubs(:editor).returns('vi')
+      File.stubs(:read).with('path/to/tempfile')
+      Recap::Support::ShellCommand.expects(:execute_interactive).with('vi path/to/tempfile')
+      config.edit_file('remote/path/to/file')
+    end
+
+    it 'returns the locally edited file contents' do
+      File.expects(:read).with('path/to/tempfile').returns('edited contents')
+      config.edit_file('remote/path/to/file').should eql('edited contents')
+    end
+
+    it 'fails if no EDITOR is set' do
+      config.stubs(:editor).returns(nil)
+      config.expects(:abort).with(regexp_matches(/To edit a remote file, either the EDITOR or DEPLOY_EDITOR environment variables must be set/))
+      config.edit_file('remote/path/to/file')
+    end
+  end
+end

data/spec/models/cli_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Recap::Support::CLI do
+  subject { Recap::Support::CLI.new }
+
+  describe "#setup" do
+    it 'determines the git repository URL' do
+      Recap::Support::ShellCommand.stubs(:execute).with('git remote -v').returns(%{
+        origin  git@github.com:freerange/recap.git (fetch)
+        origin  git@github.com:freerange/recap.git (push)
+      })
+      subject.stubs(:template)
+      subject.setup
+      subject.repository.should eql('git@github.com:freerange/recap.git')
+    end
+
+    it 'handles exception when no git repository present and uses <unkown>' do
+      Recap::Support::ShellCommand.stubs(:execute).with('git remote -v').raises
+      subject.stubs(:template)
+      subject.expects(:warn)
+      lambda { subject.setup }.should_not raise_error
+      subject.repository.should eql('<unknown>')
+    end
+  end
+end

data/spec/models/environment_spec.rb

@@ -1,29 +1,29 @@
 require 'spec_helper'
 
-describe Recap::Environment do
+describe Recap::Support::Environment do
   describe '#empty?' do
     it 'returns true if no variables set' do
-      Recap::Environment.new.empty?.should be_true
+      Recap::Support::Environment.new.empty?.should be_true
     end
 
     it 'returns false if no variables set' do
-      Recap::Environment.new('FIRST' => 'One').empty?.should be_false
+      Recap::Support::Environment.new('FIRST' => 'One').empty?.should be_false
     end
   end
 
   describe '#include?(key)' do
     it 'returns true if variables set' do
-      Recap::Environment.new('FIRST' => 'One').include?('FIRST').should be_true
+      Recap::Support::Environment.new('FIRST' => 'One').include?('FIRST').should be_true
     end
 
     it 'returns false if variable has not been set' do
-      Recap::Environment.new('DIFFERENT' => 'One').include?('FIRST').should be_false
+      Recap::Support::Environment.new('DIFFERENT' => 'One').include?('FIRST').should be_false
     end
   end
 
   describe '#get(name)' do
     subject do
-      Recap::Environment.new('FIRST' => 'One')
+      Recap::Support::Environment.new('FIRST' => 'One')
     end
 
     it 'returns value if variable set' do
@@ -37,7 +37,7 @@ describe Recap::Environment do
 
   describe '#set(name, value)' do
     subject do
-      Recap::Environment.new('FIRST' => 'One')
+      Recap::Support::Environment.new('FIRST' => 'One')
     end
 
     it 'sets variable value' do
@@ -60,7 +60,7 @@ describe Recap::Environment do
 
   describe '#each' do
     subject do
-      Recap::Environment.new('FIRST' => 'One', 'SECOND' => 'Two', 'THIRD' => 'Three', 'FOURTH' => 'Four')
+      Recap::Support::Environment.new('FIRST' => 'One', 'SECOND' => 'Two', 'THIRD' => 'Three', 'FOURTH' => 'Four')
     end
 
     it 'yields each variable and value in turn (ordered alphabetically)' do
@@ -74,7 +74,7 @@ describe Recap::Environment do
 
   describe '#merge(variables)' do
     subject do
-      Recap::Environment.new('FIRST' => 'One')
+      Recap::Support::Environment.new('FIRST' => 'One')
     end
 
     it 'sets each variable value' do
@@ -96,7 +96,7 @@ describe Recap::Environment do
 
   describe '#to_s' do
     subject do
-      Recap::Environment.new('FIRST' => 'One', 'SECOND' => 'Two', 'THIRD' => nil, 'FOURTH' => 'Four').to_s
+      Recap::Support::Environment.new('FIRST' => 'One', 'SECOND' => 'Two', 'THIRD' => nil, 'FOURTH' => 'Four').to_s
     end
 
     it 'declares each variable on its own line' do
@@ -117,26 +117,26 @@ describe Recap::Environment do
 
   describe '.from_string(declarations)' do
     it 'builds instance using string representation' do
-      instance = Recap::Environment.from_string("FIRST=One\nSECOND=Two\n")
+      instance = Recap::Support::Environment.from_string("FIRST=One\nSECOND=Two\n")
       instance.get('FIRST').should eql('One')
       instance.get('SECOND').should eql('Two')
     end
 
     it 'handles variables with numbers and underscores in their names' do
-      instance = Recap::Environment.from_string("THIS_1=One\nThose_2=Two\n")
+      instance = Recap::Support::Environment.from_string("THIS_1=One\nThose_2=Two\n")
       instance.get('THIS_1').should eql('One')
       instance.get('Those_2').should eql('Two')
     end
 
     it 'gracefully ignores missing newline at end of string' do
-      instance = Recap::Environment.from_string("FIRST=One\nSECOND=Two")
+      instance = Recap::Support::Environment.from_string("FIRST=One\nSECOND=Two")
       instance.get('FIRST').should eql('One')
       instance.get('SECOND').should eql('Two')
     end
 
     it 'acts as the inverse of #to_s' do
       string = "FIRST=One\nSECOND=Two\nTHIRD=three\n"
-      excercised = Recap::Environment.from_string(Recap::Environment.from_string(string).to_s).to_s
+      excercised = Recap::Support::Environment.from_string(Recap::Support::Environment.from_string(string).to_s).to_s
       excercised.should eql(string)
     end
   end

data/spec/models/shell_command_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Recap::Support::ShellCommand do
+  subject { Recap::Support::ShellCommand }
+
+  it 'returns stdout output if execution succeeds' do
+    subject.execute("echo 'foo'").should eql("foo\n")
+  end
+
+  it 'returns stdout output from last command if execution of multiple commands succeeds' do
+    subject.execute("echo 'foo'", "echo 'bar'").should eql("bar\n")
+  end
+
+  it 'does not raise error if execution succeeds' do
+    lambda {
+      subject.execute("true")
+    }.should_not raise_error
+  end
+
+  it 'does not raise error if execution of multiple commands succeeds' do
+    lambda {
+      subject.execute("true", "true")
+    }.should_not raise_error
+  end
+
+  it 'raises error if execution fails' do
+    lambda {
+      subject.execute("false")
+    }.should raise_error
+  end
+
+  it 'raises error if execution of any command fails' do
+    lambda {
+      subject.execute("true", "false", "true")
+    }.should raise_error
+  end
+
+  it 'includes exist status in error message if execution fails' do
+    lambda {
+      subject.execute("false")
+    }.should raise_error(RuntimeError, %r{Command:\sfalse$})
+  end
+
+  it 'includes exist status in error message if execution fails' do
+    lambda {
+      subject.execute("false")
+    }.should raise_error(RuntimeError, %r{Status:\s+1$})
+  end
+
+  it 'includes stderr output in error message if execution fails' do
+    lambda {
+      subject.execute("echo 'error' 1>&2 && false")
+    }.should raise_error(RuntimeError, %r{Message:\s+error$})
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'recap'
 
-Recap::Namespace.default_config = nil
+Recap::Support::Namespace.default_config = nil
 
 RSpec.configure do |config|
   config.mock_with :mocha

data/spec/tasks/bootstrap_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
-require 'recap/bootstrap'
+require 'recap/tasks/bootstrap'
 
-describe Recap::Bootstrap do
+describe Recap::Tasks::Bootstrap do
   let :config do
     Capistrano::Configuration.new
   end
@@ -10,25 +10,21 @@ describe Recap::Bootstrap do
     config.bootstrap
   end
 
+  let :commands do
+    sequence('commands')
+  end
+
   before do
-    Recap::Bootstrap.load_into(config)
+    Recap::Tasks::Bootstrap.load_into(config)
   end
 
   describe 'Tasks' do
     describe 'bootstrap' do
       it 'runs bootsrap:application and bootstrap:user tasks' do
-        namespace.expects(:application).in_sequence
-        namespace.expects(:user).in_sequence
+        namespace.expects(:application).in_sequence(commands)
+        namespace.expects(:user).in_sequence(commands)
         config.find_and_execute_task('bootstrap')
       end
     end
-
-    describe 'bootstrap:user' do
-      pending 'Tests not written'
-    end
-
-    describe 'bootstrap:application' do
-      pending 'Tests not written'
-    end
   end
 end

data/spec/tasks/bundler_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
+require 'recap/tasks/bundler'
 
-describe Recap::Bundler do
+describe Recap::Tasks::Bundler do
   let :config do
     Capistrano::Configuration.new
   end
@@ -15,7 +16,7 @@ describe Recap::Bundler do
 
   before do
     config.set :deploy_to, deploy_to
-    Recap::Bundler.load_into(config)
+    Recap::Tasks::Bundler.load_into(config)
   end
 
   describe 'Settings' do
@@ -39,8 +40,8 @@ describe Recap::Bundler do
     end
 
     describe '#bundle_without' do
-      it 'defaults to development, test and assets groups' do
-        config.bundle_without.should eql("development test assets")
+      it 'defaults to development and test groups' do
+        config.bundle_without.should eql("development test")
       end
     end
 
@@ -94,9 +95,9 @@ describe Recap::Bundler do
       it 'aborts with warning if Gemfile exists but Gemfile.lock doesn\'t' do
         namespace.stubs(:deployed_file_exists?).with(config.bundle_gemfile).returns(true)
         namespace.stubs(:deployed_file_exists?).with(config.bundle_gemfile_lock).returns(false)
-        lambda do
-          namespace.find_and_execute_task('bundle:install')
-        end.should raise_error(SystemExit, 'Gemfile found without Gemfile.lock.  The Gemfile.lock should be committed to the project repository')
+        expected_message = 'Gemfile found without Gemfile.lock.  The Gemfile.lock should be committed to the project repository'
+        namespace.install.expects(:abort).with(expected_message)
+        namespace.find_and_execute_task('bundle:install')
       end
     end
 
@@ -122,5 +123,36 @@ describe Recap::Bundler do
         config.find_and_execute_task('bundle:install:if_changed')
       end
     end
+
+    describe 'bundle:check_installed' do
+      before do
+        config.set(:application_user, 'fred')
+      end
+
+      it 'checks to see whether bundler is installed' do
+        namespace.expects(:exit_code_as_app).with('bundle --version', '.').returns("0")
+        config.find_and_execute_task('bundle:check_installed')
+      end
+
+      it 'aborts with explanation if bundler command fails' do
+        namespace.stubs(:exit_code_as_app).returns("1")
+        namespace.expects(:abort).with("The application user 'fred' cannot execute `bundle`.  Please check you have bundler installed.")
+        config.find_and_execute_task('bundle:check_installed')
+      end
+    end
+  end
+
+  describe 'Callbacks' do
+    describe 'bundle:check_installed' do
+      before do
+        Recap::Tasks::Preflight.load_into(config)
+      end
+
+      it 'runs after `preflight:check`' do
+        config.stubs(:find_and_execute_task)
+        config.expects(:find_and_execute_task).with('bundle:check_installed')
+        config.trigger :after, config.find_task('preflight:check')
+      end
+    end
   end
 end

data/spec/tasks/deploy_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
+require 'recap/tasks/deploy'
 
-describe Recap::Deploy do
+describe Recap::Tasks::Deploy do
   let :config do
     Capistrano::Configuration.new
   end
@@ -9,8 +10,12 @@ describe Recap::Deploy do
     config.deploy
   end
 
+  let :commands do
+    sequence('commands')
+  end
+
   before do
-    Recap::Deploy.load_into(config)
+    Recap::Tasks::Deploy.load_into(config)
   end
 
   it 'configures capistrano to use ssh key forwarding' do
@@ -24,17 +29,15 @@ describe Recap::Deploy do
   describe 'Settings' do
     describe '#application' do
       it 'exits if accessed before being set' do
-        lambda do
-          config.application
-        end.should raise_error(SystemExit)
+        namespace.expects(:abort).with(regexp_matches(/You must set the name of your application in your Capfile/))
+        config.application
       end
     end
 
     describe '#repository' do
       it 'exits if accessed before being set' do
-        lambda do
-          config.repository
-        end.should raise_error(SystemExit)
+        namespace.expects(:abort).with(regexp_matches(/You must set the git respository location in your Capfile/))
+        config.repository
       end
     end
 
@@ -59,10 +62,10 @@ describe Recap::Deploy do
     end
 
     describe '#deploy_to' do
-      it 'defaults to a folder within the application user home directory' do
+      it 'defaults to an `app` folder within the application user home directory' do
         config.set :application, 'hare'
         config.set :application_user, 'rabbitfoot'
-        config.deploy_to.should eql('/home/rabbitfoot/apps/hare')
+        config.deploy_to.should eql('/home/rabbitfoot/app')
       end
     end
 
@@ -103,7 +106,10 @@ describe Recap::Deploy do
     end
 
     describe 'deploy:setup' do
-      it 'runs deploy:clone_code task' do
+      it 'runs env:set and deploy:clone_code tasks' do
+        env = stub('env')
+        config.stubs(:env).returns(env)
+        env.expects('set')
         namespace.expects(:clone_code)
         config.find_and_execute_task('deploy:setup')
       end
@@ -113,22 +119,33 @@ describe Recap::Deploy do
         namespace.expects(:clone_code).never
         config.find_and_execute_task('deploy:setup')
       end
+
+      it 'removes the deploy_to dir if a rollback is triggered' do
+        config.stubs(:env).returns(stub_everything('env'))
+        namespace.stubs(:as_app)
+        namespace.expects(:as_app).with('rm -fr ' + deploy_to)
+        namespace.stubs(:git).raises(RuntimeError)
+        config.find_and_execute_task('deploy:setup') rescue RuntimeError
+      end
     end
 
     describe 'deploy:clone_code' do
       it 'creates deploy_to dir, ensures it\'s group writable, then clones the repository into it' do
-        namespace.expects(:as_app).with('mkdir -p ' + deploy_to, '~').in_sequence
-        namespace.expects(:as_app).with('chmod g+rw ' + deploy_to).in_sequence
-        namespace.expects(:git).with('clone ' + repository + ' .').in_sequence
+        namespace.expects(:as_app).with('mkdir -p ' + deploy_to, '~').in_sequence(commands)
+        namespace.expects(:as_app).with('chmod g+rw ' + deploy_to).in_sequence(commands)
+        namespace.expects(:git).with('clone ' + repository + ' .').in_sequence(commands)
         config.find_and_execute_task('deploy:clone_code')
       end
     end
 
     describe 'deploy' do
-      it 'runs deploy:update_code, deploy:tag and then deploy:restart tasks' do
-        namespace.expects(:update_code).in_sequence
-        namespace.expects(:tag).in_sequence
-        namespace.expects(:restart).in_sequence
+      it 'runs env:set, deploy:update_code, deploy:tag and then deploy:restart tasks' do
+        env = stub('env')
+        config.stubs(:env).returns(env)
+        env.expects('set')
+        namespace.expects(:update_code).in_sequence(commands)
+        namespace.expects(:tag).in_sequence(commands)
+        namespace.expects(:restart).in_sequence(commands)
         config.find_and_execute_task('deploy')
       end
 
@@ -154,8 +171,8 @@ describe Recap::Deploy do
     describe 'deploy:update_code' do
       it 'fetches latest changes, then resets to repository branch' do
         config.set :branch, 'release-branch'
-        namespace.expects(:git).with('fetch').in_sequence
-        namespace.expects(:git).with('reset --hard origin/release-branch').in_sequence
+        namespace.expects(:git).with('fetch').in_sequence(commands)
+        namespace.expects(:git).with('reset --hard origin/release-branch').in_sequence(commands)
         namespace.find_and_execute_task('deploy:update_code')
       end
     end
@@ -176,17 +193,16 @@ describe Recap::Deploy do
       it 'deletes latest tag, resets to previous tag and restarts' do
         config.stubs(:latest_tag).returns('release-2')
         config.stubs(:latest_tag_from_repository).returns('release-1')
-        namespace.expects(:git).with('tag -d release-2').in_sequence
-        namespace.expects(:git).with('reset --hard release-1').in_sequence
-        namespace.expects(:restart).in_sequence
+        namespace.expects(:git).with('tag -d release-2').in_sequence(commands)
+        namespace.expects(:git).with('reset --hard release-1').in_sequence(commands)
+        namespace.expects(:restart).in_sequence(commands)
         namespace.find_and_execute_task('deploy:rollback')
       end
 
       it 'aborts if no tag has been deployed' do
         config.stubs(:latest_tag).returns(nil)
-        lambda do
-          namespace.find_and_execute_task('deploy:rollback')
-        end.should raise_error(SystemExit, 'This app is not currently deployed')
+        namespace.rollback.expects(:abort).with('This app is not currently deployed')
+        namespace.find_and_execute_task('deploy:rollback')
       end
     end