recap 0.1.0 → 0.2.0

data/.gitignore

@@ -1,4 +1,7 @@
 *.gem
 .bundle
+.vagrant
 Gemfile.lock
 pkg/*
+/test-vm/share/*
+capistrano.log

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/README.md

@@ -1,5 +1,14 @@
-[recap](http://github.com/freerange/recap) is a simple, EXPERIMENTAL, opinionated set of capistrano deployment recipes, using git's strengths to deploy applications in a fast and simple manner.
+[recap](http://github.com/freerange/recap) is an opinionated set of capistrano deployment recipes, designed to use git's strengths to deploy applications and websites in a fast and simple manner.
 
-It started as a playaround with git, and is slowly evolving into something useful (though it isn't there) yet.  There are lots of gaps, and half-thought-through ideas.  Also, it needs a proper name.
+Recap's core features are:
 
-The main documentation can be found at [http://code.gofreerange.com/recap](http://code.gofreerange.com/recap), while 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).
+  * Release versions are managed with git.  There's no need for `releases` or `current` folders, and no symlinking.
+  * Intelligently decides whether tasks need to execute.  e.g. The `bundle:install` task will only run if a `Gemfile.lock` exists, and if it has changed since the last deployment.
+  * A dedicated user account and group owns all an application's associated files and processes.
+  * Deployments are run using personal logins.  The right to deploy is granted by adding a user to the application group.
+  * Environment variables are used for application specific configuration.  These can easily be read and set using the `env` and `env:set` tasks.
+  * Out of the box support for `bundler` and `foreman`
+
+For more information, the main documentation can be found at [http://code.gofreerange.com/recap](http://code.gofreerange.com/recap), while the code is available [on github](https://github.com/freerange/recap).
+
+Recap was written by [Tom Ward](http://tomafro.net) and the other members of [Go Free Range](http://gofreerange.com), and is released under the [MIT License](https://github.com/freerange/recap/blob/master/LICENSE).

data/Rakefile

@@ -1,5 +1,6 @@
 require 'bundler/gem_tasks'
 require 'rocco/tasks'
+require 'rspec/core/rake_task'
 
 desc 'build docs'
 Rocco::Task.new :rocco, 'doc/', ['index.rb', 'lib/**/*.rb']
@@ -10,3 +11,10 @@ task :publish do
   commit = `echo "Publishing docs from master branch" | git commit-tree #{sha} -p refs/heads/gh-pages`.strip
   `git update-ref refs/heads/gh-pages #{commit}`
 end
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = "spec/**/*_spec.rb"
+  t.rspec_opts = "-fn --color"
+end
+
+task :default => :spec

data/Vagrantfile

@@ -0,0 +1,61 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant::Config.run do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "lucid64"
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system.
+  config.vm.box_url = "http://files.vagrantup.com/lucid64.box"
+
+  # Boot with a GUI so you can see the screen. (Default is headless)
+  # config.vm.boot_mode = :gui
+
+  # Assign this VM to a host-only network IP, allowing you to access it
+  # via the IP. Host-only networks can talk to the host machine as well as
+  # any other machines on the same network, but cannot be accessed (through this
+  # network interface) by any external networks.
+  # config.vm.network :hostonly, "33.33.33.10"
+
+  # Assign this VM to a bridged network, allowing you to connect directly to a
+  # network using the host's network device. This makes the VM appear as another
+  # physical device on your network.
+  # config.vm.network :bridged
+
+  # Forward a port from the guest to the host, which allows for outside
+  # computers to access the VM, whereas host only networking does not.
+  # config.vm.forward_port 80, 8080
+
+  # Share an additional folder to the guest VM. The first argument is
+  # an identifier, the second is the path on the guest to mount the
+  # folder, and the third is the path on the host to the actual folder.
+  config.vm.share_folder 'test', '/recap/share', 'test-vm/share'
+
+  # Enable provisioning with Puppet stand alone.  Puppet manifests
+  # are contained in a directory path relative to this Vagrantfile.
+  # You will need to create the manifests directory and a manifest in
+  # the file base.pp in the manifests_path directory.
+  #
+  # An example Puppet manifest to provision the message of the day:
+  #
+  # # group { "puppet":
+  # #   ensure => "present",
+  # # }
+  # #
+  # # File { owner => 0, group => 0, mode => 0644 }
+  # #
+  # # file { '/etc/motd':
+  # #   content => "Welcome to your Vagrant-built virtual machine!
+  # #               Managed by Puppet.\n"
+  # # }
+  #
+  config.vm.provision :puppet do |puppet|
+    puppet.manifests_path = "test-vm/manifests"
+    puppet.manifest_file  = "base.pp"
+  end
+end

data/doc/index.html

@@ -13,6 +13,8 @@
     <div id="jump_wrapper">
       <div id="jump_page">
           <a class="source" href="index.html">index.rb</a>
+          <a class="source" href="lib/recap.html">recap.rb</a>
+          <a class="source" href="lib/recap/bootstrap.html">bootstrap.rb</a>
           <a class="source" href="lib/recap/bundler.html">bundler.rb</a>
           <a class="source" href="lib/recap/capistrano_extensions.html">capistrano_extensions.rb</a>
           <a class="source" href="lib/recap/cli.html">cli.rb</a>
@@ -20,6 +22,7 @@
           <a class="source" href="lib/recap/deploy.html">deploy.rb</a>
           <a class="source" href="lib/recap/env.html">env.rb</a>
           <a class="source" href="lib/recap/foreman.html">foreman.rb</a>
+          <a class="source" href="lib/recap/namespace.html">namespace.rb</a>
           <a class="source" href="lib/recap/preflight.html">preflight.rb</a>
           <a class="source" href="lib/recap/rails.html">rails.rb</a>
           <a class="source" href="lib/recap/version.html">version.rb</a>
@@ -79,8 +82,8 @@ There&rsquo;s no need for <code>releases</code>, <code>shared</code> or <code>cu
           <a class="pilcrow" href="#section-4">&#182;</a>
         </div>
         <p>Run all commands as the <code>application_user</code>, loading the full user environment.  The only
-exceptions are <code>git</code> commands (which often rely on SSH agent forwarding for authentication), and anything
-that requires <code>sudo</code>.</p>
+exceptions are <code>git</code> commands (which often rely on SSH agent forwarding for authentication), and 
+anything that requires <code>sudo</code>.</p>
       </td>
       <td class=code>
         <div class='highlight'><pre></pre></div>
@@ -92,8 +95,8 @@ that requires <code>sudo</code>.</p>
           <a class="pilcrow" href="#section-5">&#182;</a>
         </div>
         <p>Use <code>git</code> to avoid unecessary work.  If the <code>Gemfile.lock</code> hasn&rsquo;t changed, there&rsquo;s no need to run
-<code>bundle install</code>.  Similarly if there are no new migrations, why do <code>rake db:migrate</code>.  Faster deploys
-mean more frequent deploys, which in our experience leads to better applications.</p>
+<code>bundle install</code>.  Similarly if there are no new migrations, why do <code>rake db:migrate</code>?  Faster 
+deploys mean more frequent deploys.</p>
       </td>
       <td class=code>
         <div class='highlight'><pre></pre></div>
@@ -104,9 +107,9 @@ mean more frequent deploys, which in our experience leads to better applications
         <div class="pilwrap">
           <a class="pilcrow" href="#section-6">&#182;</a>
         </div>
-        <p>Avoid the use of <code>sudo</code> (other than to change to the <code>application_user</code>).  As much as possible, <code>sudo</code>
-is only used to <code>su</code> to the <code>application_user</code> before running a command.  To avoid typing a password
-to perform the majority of deployment tasks, this code can be added to
+        <p>Avoid the use of <code>sudo</code> (other than to change to the <code>application_user</code>).  As much as possible, 
+<code>sudo</code> is only used to <code>su</code> to the <code>application_user</code> before running a command.  To avoid having to
+type a password to perform the majority of deployment tasks, these lines can be added to
 <code>/etc/sudoers.d/application</code> (change <code>application</code> to the name of your app).</p>
       </td>
       <td class=code>
@@ -117,25 +120,25 @@ to perform the majority of deployment tasks, this code can be added to
 <span class="o">%</span><span class="n">application</span> <span class="no">ALL</span><span class="o">=</span><span class="no">NOPASSWD</span><span class="p">:</span><span class="sr"> /bin/su</span> <span class="n">application</span><span class="o">*</span></pre></div>
       </td>
     </tr>
-    <tr id='section-Code_layout'>
+    <tr id='section-7'>
       <td class=docs>
         <div class="pilwrap">
-          <a class="pilcrow" href="#section-Code_layout">&#182;</a>
+          <a class="pilcrow" href="#section-7">&#182;</a>
         </div>
-        <h3>Code layout</h3>
+        <p>Use environment variables for configuration.  Rather than setting <code>rails_env</code> in the <code>Capfile</code>,
+<code>RAILS_ENV</code> (or <code>RACK_ENV</code>) variables should be set for the <code>application_user</code>.  The <code>env:set</code> and
+<code>env:edit</code> tasks help do this.</p>
       </td>
       <td class=code>
         <div class='highlight'><pre></pre></div>
       </td>
     </tr>
-    <tr id='section-8'>
+    <tr id='section-Code_layout'>
       <td class=docs>
         <div class="pilwrap">
-          <a class="pilcrow" href="#section-8">&#182;</a>
+          <a class="pilcrow" href="#section-Code_layout">&#182;</a>
         </div>
-        <p>The main deployment tasks are defined in <a href="lib/recap.html">recap.rb</a>.  Automatic
-checks to ensure servers are correctly setup are in
-<a href="lib/recap/preflight.html">recap/preflight.rb</a>.</p>
+        <h3>Code layout</h3>
       </td>
       <td class=code>
         <div class='highlight'><pre></pre></div>
@@ -146,8 +149,10 @@ checks to ensure servers are correctly setup are in
         <div class="pilwrap">
           <a class="pilcrow" href="#section-9">&#182;</a>
         </div>
-        <p>In addition, there are extensions for <a href="lib/recap/bundler.html">bundler</a> and
-<a href="lib/recap/foreman.html">foreman</a>.</p>
+        <p>The main deployment tasks are defined in <a href="lib/recap/deploy.html">recap/deploy.rb</a>.  Automatic
+checks to ensure servers are correctly setup are in
+<a href="lib/recap/preflight.html">recap/preflight.rb</a>, while tasks for environment variables are in
+<a href="lib/recap/env.html">recap/env.rb</a></p>
       </td>
       <td class=code>
         <div class='highlight'><pre></pre></div>
@@ -158,30 +163,31 @@ checks to ensure servers are correctly setup are in
         <div class="pilwrap">
           <a class="pilcrow" href="#section-10">&#182;</a>
         </div>
-        <p>For (limited) compatability with other existing recipes, see
-<a href="lib/recap/compatibility.html">compatibility</a></p>
+        <p>In addition, there are extensions for <a href="lib/recap/bundler.html">bundler</a>, 
+<a href="lib/recap/foreman.html">foreman</a> and <a href="lib/recap/rails.html">rails</a></p>
       </td>
       <td class=code>
         <div class='highlight'><pre></pre></div>
       </td>
     </tr>
-    <tr id='section-Deployment_target'>
+    <tr id='section-11'>
       <td class=docs>
         <div class="pilwrap">
-          <a class="pilcrow" href="#section-Deployment_target">&#182;</a>
+          <a class="pilcrow" href="#section-11">&#182;</a>
         </div>
-        <h3>Deployment target</h3>
+        <p>For limited compatability with other existing recipes, see
+<a href="lib/recap/compatibility.html">compatibility</a>.</p>
       </td>
       <td class=code>
         <div class='highlight'><pre></pre></div>
       </td>
     </tr>
-    <tr id='section-12'>
+    <tr id='section-Deployment_target'>
       <td class=docs>
         <div class="pilwrap">
-          <a class="pilcrow" href="#section-12">&#182;</a>
+          <a class="pilcrow" href="#section-Deployment_target">&#182;</a>
         </div>
-        <p>These recipes have been run successful against Ubuntu.</p>
+        <h3>Deployment target</h3>
       </td>
       <td class=code>
         <div class='highlight'><pre></pre></div>
@@ -192,7 +198,8 @@ checks to ensure servers are correctly setup are in
         <div class="pilwrap">
           <a class="pilcrow" href="#section-13">&#182;</a>
         </div>
-        <p>The application should be run as the application user; if using Apache and Passenger, you should set the <code>PassengerDefaultUser</code> directive to be the same as the <code>application_user</code>.</p>
+        <p>These recipes have been developed and tested using Ubuntu 11.04, though they may work well with
+other flavours of unix.</p>
       </td>
       <td class=code>
         <div class='highlight'><pre></pre></div>
@@ -203,6 +210,18 @@ checks to ensure servers are correctly setup are in
         <div class="pilwrap">
           <a class="pilcrow" href="#section-14">&#182;</a>
         </div>
+        <p>The application should be run as the application user; if using Apache and Passenger, you should 
+set the <code>PassengerDefaultUser</code> directive to be the same as the <code>application_user</code>.</p>
+      </td>
+      <td class=code>
+        <div class='highlight'><pre></pre></div>
+      </td>
+    </tr>
+    <tr id='section-15'>
+      <td class=docs>
+        <div class="pilwrap">
+          <a class="pilcrow" href="#section-15">&#182;</a>
+        </div>
         <p>The code is available <a href="http://github.com/freerange/recap">on github</a> and released under the
 <a href="https://github.com/freerange/recap/blob/master/LICENSE">MIT License</a></p>
 

data/doc/lib/recap/bootstrap.html

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8">
+  <title>bootstrap.rb</title>
+  <link rel="stylesheet" href="http://jashkenas.github.com/docco/resources/docco.css">
+</head>
+<body>
+<div id='container'>
+  <div id="background"></div>
+  <div id="jump_to">
+    Jump To &hellip;
+    <div id="jump_wrapper">
+      <div id="jump_page">
+          <a class="source" href="../../index.html">index.rb</a>
+          <a class="source" href="../recap.html">recap.rb</a>
+          <a class="source" href="bootstrap.html">bootstrap.rb</a>
+          <a class="source" href="bundler.html">bundler.rb</a>
+          <a class="source" href="capistrano_extensions.html">capistrano_extensions.rb</a>
+          <a class="source" href="cli.html">cli.rb</a>
+          <a class="source" href="compatibility.html">compatibility.rb</a>
+          <a class="source" href="deploy.html">deploy.rb</a>
+          <a class="source" href="env.html">env.rb</a>
+          <a class="source" href="foreman.html">foreman.rb</a>
+          <a class="source" href="namespace.html">namespace.rb</a>
+          <a class="source" href="preflight.html">preflight.rb</a>
+          <a class="source" href="rails.html">rails.rb</a>
+          <a class="source" href="version.html">version.rb</a>
+      </div>
+    </div>
+  </div>
+  <table cellspacing=0 cellpadding=0>
+  <thead>
+    <tr>
+      <th class=docs><h1>bootstrap.rb</h1></th>
+      <th class=code></th>
+    </tr>
+  </thead>
+  <tbody>
+  </table>
+</div>
+</body>

data/doc/lib/recap/bundler.html

@@ -13,6 +13,8 @@
     <div id="jump_wrapper">
       <div id="jump_page">
           <a class="source" href="../../index.html">index.rb</a>
+          <a class="source" href="../recap.html">recap.rb</a>
+          <a class="source" href="bootstrap.html">bootstrap.rb</a>
           <a class="source" href="bundler.html">bundler.rb</a>
           <a class="source" href="capistrano_extensions.html">capistrano_extensions.rb</a>
           <a class="source" href="cli.html">cli.rb</a>
@@ -20,6 +22,7 @@
           <a class="source" href="deploy.html">deploy.rb</a>
           <a class="source" href="env.html">env.rb</a>
           <a class="source" href="foreman.html">foreman.rb</a>
+          <a class="source" href="namespace.html">namespace.rb</a>
           <a class="source" href="preflight.html">preflight.rb</a>
           <a class="source" href="rails.html">rails.rb</a>
           <a class="source" href="version.html">version.rb</a>
@@ -42,7 +45,10 @@
         <p>The bundler recipe ensures that the application bundle is installed whenever the code is updated.</p>
       </td>
       <td class=code>
-        <div class='highlight'><pre><span class="no">Capistrano</span><span class="o">::</span><span class="no">Configuration</span><span class="o">.</span><span class="n">instance</span><span class="p">(</span><span class="ss">:must_exist</span><span class="p">)</span><span class="o">.</span><span class="n">load</span> <span class="k">do</span></pre></div>
+        <div class='highlight'><pre><span class="k">module</span> <span class="nn">Recap::Bundler</span>
+  <span class="kp">extend</span> <span class="no">Recap</span><span class="o">::</span><span class="no">Namespace</span>
+
+  <span class="n">namespace</span> <span class="ss">:bundle</span> <span class="k">do</span></pre></div>
       </td>
     </tr>
     <tr id='section-2'>
@@ -53,7 +59,7 @@
         <p>Each bundle is declared in a <code>Gemfile</code>, by default in the root of the application directory</p>
       </td>
       <td class=code>
-        <div class='highlight'><pre>  <span class="n">set</span><span class="p">(</span><span class="ss">:bundle_gemfile</span><span class="p">)</span> <span class="p">{</span> <span class="s2">&quot;</span><span class="si">#{</span><span class="n">deploy_to</span><span class="si">}</span><span class="s2">/Gemfile&quot;</span> <span class="p">}</span></pre></div>
+        <div class='highlight'><pre>    <span class="n">set</span><span class="p">(</span><span class="ss">:bundle_gemfile</span><span class="p">)</span> <span class="p">{</span> <span class="s2">&quot;</span><span class="si">#{</span><span class="n">deploy_to</span><span class="si">}</span><span class="s2">/Gemfile&quot;</span> <span class="p">}</span></pre></div>
       </td>
     </tr>
     <tr id='section-3'>
@@ -64,7 +70,7 @@
         <p>As well as a <code>Gemfile</code>, application repositories should also contain a <code>Gemfile.lock</code>.</p>
       </td>
       <td class=code>
-        <div class='highlight'><pre>  <span class="n">set</span><span class="p">(</span><span class="ss">:bundle_gemfile_lock</span><span class="p">)</span> <span class="p">{</span> <span class="s2">&quot;</span><span class="si">#{</span><span class="n">bundle_gemfile</span><span class="si">}</span><span class="s2">.lock&quot;</span> <span class="p">}</span></pre></div>
+        <div class='highlight'><pre>    <span class="n">set</span><span class="p">(</span><span class="ss">:bundle_gemfile_lock</span><span class="p">)</span> <span class="p">{</span> <span class="s2">&quot;</span><span class="si">#{</span><span class="n">bundle_gemfile</span><span class="si">}</span><span class="s2">.lock&quot;</span> <span class="p">}</span></pre></div>
       </td>
     </tr>
     <tr id='section-4'>
@@ -73,10 +79,10 @@
           <a class="pilcrow" href="#section-4">&#182;</a>
         </div>
         <p>An application&rsquo;s gems are installed within the application directory.  By default they are
-places under <code>.bundle/gems</code>.</p>
+placed under <code>vendor/gems</code>.</p>
       </td>
       <td class=code>
-        <div class='highlight'><pre>  <span class="n">set</span><span class="p">(</span><span class="ss">:bundle_dir</span><span class="p">)</span> <span class="p">{</span> <span class="s2">&quot;</span><span class="si">#{</span><span class="n">deploy_to</span><span class="si">}</span><span class="s2">/.bundle/gems&quot;</span> <span class="p">}</span></pre></div>
+        <div class='highlight'><pre>    <span class="n">set</span><span class="p">(</span><span class="ss">:bundle_path</span><span class="p">)</span> <span class="p">{</span> <span class="s2">&quot;</span><span class="si">#{</span><span class="n">deploy_to</span><span class="si">}</span><span class="s2">/vendor/gems&quot;</span> <span class="p">}</span></pre></div>
       </td>
     </tr>
     <tr id='section-5'>
@@ -88,10 +94,7 @@ places under <code>.bundle/gems</code>.</p>
 <code>assets</code> groups are skipped.</p>
       </td>
       <td class=code>
-        <div class='highlight'><pre>  <span class="n">set</span><span class="p">(</span><span class="ss">:bundle_without</span><span class="p">)</span> <span class="p">{</span> <span class="s2">&quot;development test assets&quot;</span> <span class="p">}</span>
-
-  <span class="n">namespace</span> <span class="ss">:bundle</span> <span class="k">do</span>
-    <span class="n">namespace</span> <span class="ss">:install</span> <span class="k">do</span></pre></div>
+        <div class='highlight'><pre>    <span class="n">set</span><span class="p">(</span><span class="ss">:bundle_without</span><span class="p">)</span> <span class="p">{</span> <span class="s2">&quot;development test assets&quot;</span> <span class="p">}</span></pre></div>
       </td>
     </tr>
     <tr id='section-6'>
@@ -99,6 +102,20 @@ places under <code>.bundle/gems</code>.</p>
         <div class="pilwrap">
           <a class="pilcrow" href="#section-6">&#182;</a>
         </div>
+        <p>The main bundle install command uses all the settings above, together with the <code>&mdash;deployment</code>,
+<code>&mdash;binstubs</code> and <code>&mdash;quiet</code> flags</p>
+      </td>
+      <td class=code>
+        <div class='highlight'><pre>    <span class="n">set</span><span class="p">(</span><span class="ss">:bundle_install_command</span><span class="p">)</span> <span class="p">{</span> <span class="s2">&quot;bundle install --gemfile </span><span class="si">#{</span><span class="n">bundle_gemfile</span><span class="si">}</span><span class="s2"> --path </span><span class="si">#{</span><span class="n">bundle_path</span><span class="si">}</span><span class="s2"> --deployment --quiet --binstubs --without </span><span class="si">#{</span><span class="n">bundle_without</span><span class="si">}</span><span class="s2">&quot;</span> <span class="p">}</span>
+
+    <span class="n">namespace</span> <span class="ss">:install</span> <span class="k">do</span></pre></div>
+      </td>
+    </tr>
+    <tr id='section-7'>
+      <td class=docs>
+        <div class="pilwrap">
+          <a class="pilcrow" href="#section-7">&#182;</a>
+        </div>
         <p>After cloning or updating the code, we only install the bundle if the <code>Gemfile</code> has changed.</p>
       </td>
       <td class=code>
@@ -110,10 +127,10 @@ places under <code>.bundle/gems</code>.</p>
       <span class="k">end</span></pre></div>
       </td>
     </tr>
-    <tr id='section-7'>
+    <tr id='section-8'>
       <td class=docs>
         <div class="pilwrap">
-          <a class="pilcrow" href="#section-7">&#182;</a>
+          <a class="pilcrow" href="#section-8">&#182;</a>
         </div>
         <p>Occassionally it&rsquo;s useful to force an install (such as if something has gone wrong in
 a previous deployment)</p>
@@ -121,28 +138,28 @@ a previous deployment)</p>
       <td class=code>
         <div class='highlight'><pre>      <span class="n">desc</span> <span class="s2">&quot;Install the latest gem bundle&quot;</span>
       <span class="n">task</span> <span class="ss">:default</span> <span class="k">do</span>
-        <span class="k">if</span> <span class="n">deployed_file_exists?</span><span class="p">(</span><span class="n">bundle_gemfile</span><span class="p">)</span>
-          <span class="n">bundler</span> <span class="s2">&quot;install --gemfile </span><span class="si">#{</span><span class="n">bundle_gemfile</span><span class="si">}</span><span class="s2"> --path </span><span class="si">#{</span><span class="n">bundle_dir</span><span class="si">}</span><span class="s2"> --deployment --quiet --binstubs --without </span><span class="si">#{</span><span class="n">bundle_without</span><span class="si">}</span><span class="s2">&quot;</span>
+        <span class="k">if</span> <span class="n">deployed_file_exists?</span><span class="p">(</span><span class="n">bundle_gemfile_lock</span><span class="p">)</span>
+          <span class="n">as_app</span> <span class="n">bundle_install_command</span>
         <span class="k">else</span>
           <span class="nb">puts</span> <span class="s2">&quot;Skipping bundle:install as no Gemfile found&quot;</span>
         <span class="k">end</span>
       <span class="k">end</span>
-    <span class="k">end</span>
-  <span class="k">end</span></pre></div>
+    <span class="k">end</span></pre></div>
       </td>
     </tr>
-    <tr id='section-8'>
+    <tr id='section-9'>
       <td class=docs>
         <div class="pilwrap">
-          <a class="pilcrow" href="#section-8">&#182;</a>
+          <a class="pilcrow" href="#section-9">&#182;</a>
         </div>
         <p>To install the bundle automatically each time the code is updated or cloned, hooks are added to
 the <code>deploy:clone_code</code> and <code>deploy:update_code</code> tasks.</p>
 
       </td>
       <td class=code>
-        <div class='highlight'><pre>  <span class="n">after</span> <span class="s1">&#39;deploy:clone_code&#39;</span><span class="p">,</span> <span class="s1">&#39;bundle:install:if_changed&#39;</span>
-  <span class="n">after</span> <span class="s1">&#39;deploy:update_code&#39;</span><span class="p">,</span> <span class="s1">&#39;bundle:install:if_changed&#39;</span>
+        <div class='highlight'><pre>    <span class="n">after</span> <span class="s1">&#39;deploy:clone_code&#39;</span><span class="p">,</span> <span class="s1">&#39;bundle:install:if_changed&#39;</span>
+    <span class="n">after</span> <span class="s1">&#39;deploy:update_code&#39;</span><span class="p">,</span> <span class="s1">&#39;bundle:install:if_changed&#39;</span>
+  <span class="k">end</span>
 <span class="k">end</span></pre></div>
       </td>
     </tr>