recap 1.0.6 → 1.0.7

data/README.md

@@ -1,6 +1,6 @@
 # Recap
 
-[Recap](https://github.com/freerange/recap) is an opinionated set of [Capistrano](https://github.com/capistrano/capistrano) deployment recipes, designed to use git's strengths to deploy applications and websites in a fast and simple manner.
+[Recap](https://github.com/freerange/recap) is an opinionated set of [Capistrano](https://github.com/capistrano/capistrano) deployment recipes, that use git's strengths to deploy applications and websites in a fast and simple manner.
 
 
 ## Features & Aims

data/lib/recap/tasks/bootstrap.rb

@@ -55,7 +55,7 @@ fi
       end
     end
 
-    # The `bootstrap:user` task sets up the personal accounts of user who can deploy applications.
+    # The `bootstrap:user` task sets up the personal accounts of users who can deploy applications.
     # In order to deploy a particular app, the account's git configuration must be set (so
     # that releases can be tagged), and the account must be a member of the application group.
     desc 'Sets up the server account used by a deploying user'

data/lib/recap/tasks/deploy.rb

@@ -68,11 +68,12 @@ module Recap::Tasks::Deploy
     # task manually as it is run as part of `deploy:setup`.
     task :clone_code, :except => {:no_release => true} do
       on_rollback { as_app "rm -fr #{deploy_to}" }
-      # Before cloning, the directory needs to exist and be both readable and writable by the application group
+      # Before cloning, the directory needs to exist and be both readable and writeable by the application group
       as_app "mkdir -p #{deploy_to}", "~"
       as_app "chmod g+rw #{deploy_to}"
-      # Then clone the code
+      # Then clone the code and change to the given branch
       git "clone #{repository} ."
+      git "reset --hard origin/#{branch}"
     end
 
     # The `deploy` task ensures the environment is set, updates the application code,

data/lib/recap/version.rb

@@ -1,3 +1,3 @@
 module Recap
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/spec/tasks/deploy_spec.rb

@@ -131,9 +131,12 @@ describe Recap::Tasks::Deploy do
 
     describe 'deploy:clone_code' do
       it 'creates deploy_to dir, ensures it\'s group writable, then clones the repository into it' do
+        config.set :branch, 'given-branch'
+
         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)
+        namespace.expects(:git).with('reset --hard origin/given-branch').in_sequence(commands)
         config.find_and_execute_task('deploy:clone_code')
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recap
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -266,7 +266,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2984683490822306722
+      hash: 1151781088408316006
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2984683490822306722
+      hash: 1151781088408316006
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23