capistrano-deploy 0.3.1 → 0.3.2

data/.gitignore

@@ -3,4 +3,5 @@ pkg/*
 .bundle
 .yardoc
 doc
+Gemfile.lock
 vendor/bundle

data/README.md

@@ -1,4 +1,4 @@
-Capistrano deploy recipes [![TravisCI](https://secure.travis-ci.org/lest/capistrano-deploy.png?branch=master)](http://travis-ci.org/lest/capistrano-deploy)
+Capistrano deploy recipes [![TravisCI](https://secure.travis-ci.org/lest/capistrano-deploy.png?branch=master)](http://travis-ci.org/lest/capistrano-deploy) [![Gemnasium](https://gemnasium.com/lest/capistrano-deploy.png)](https://gemnasium.com/lest/capistrano-deploy)
 =========================
 
 Inspired by https://github.com/blog/470-deployment-script-spring-cleaning.
@@ -6,18 +6,30 @@ Inspired by https://github.com/blog/470-deployment-script-spring-cleaning.
 Quickstart with Git and Rails
 -----------------------------
 
-Minimal Capfile for Rails deploy using Git:
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'capistrano-deploy', :group => :development, :require => false
+```
+
+Create a file named `Capfile` in your project root directory:
 
 ```ruby
 require 'capistrano-deploy'
-use_recipes :git, :rails
+use_recipes :git, :bundle, :rails
 
 server 'server name or ip address', :web, :app, :db, :primary => true
 set :user, 'user for deploy'
 set :deploy_to, '/deploy/to/path'
 set :repository, 'your git repository'
+
+after 'deploy:update', 'bundle:install'
 ```
 
+And then execute:
+
+    bundle
+
 To setup:
 
     cap deploy:setup
@@ -34,6 +46,12 @@ To look through the changes to be deployed:
 
     cap deploy:pending
 
+If you want to update to a specific commit (e.g. to rollback):
+
+    cap deploy COMMIT=foobarbaz
+
+Note: it may be required to run `bundle exec cap ...` instead of `cap ...`.
+
 Multistage
 ----------
 
@@ -84,7 +102,7 @@ Rails Assets
 Use recipe:
 
 ```ruby
-use_recipe :bundle
+use_recipe :rails_assets
 ```
 
 Add callback to precompile assets after update:

data/capistrano-deploy.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'capistrano-deploy'
-  s.version     = '0.3.1'
+  s.version     = '0.3.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Sergey Nartimov']
   s.email       = ['just.lest@gmail.com']
@@ -12,5 +12,5 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
-  s.add_dependency('capistrano', '~> 2.9.0')
+  s.add_dependency('capistrano', '~> 2.9')
 end

data/lib/capistrano-deploy/git.rb

@@ -24,14 +24,16 @@ module CapistranoDeploy
 
           desc 'Update the deployed code'
           task :update, :except => {:no_release => true} do
-            command = ["cd #{deploy_to}", 'git fetch origin', "git reset --hard origin/#{branch}"]
+            commit = ENV['COMMIT'] || "origin/#{branch}"
+            command = ["cd #{deploy_to}", 'git fetch origin', "git reset --hard #{commit}"]
             command += ['git submodule init', 'git submodule -q sync', 'git submodule -q update'] if enable_submodules
             run command.join(' && ')
           end
 
           desc 'Show pending commits'
           task :pending do
-            system("git log --pretty=medium --stat #{current_revision}..origin/#{branch}")
+            commit = ENV['COMMIT'] || "origin/#{branch}"
+            system("git log --pretty=medium --stat #{current_revision}..#{commit}")
           end
         end
       end

data/spec/git_spec.rb

@@ -6,6 +6,8 @@ describe 'git' do
       use_recipe :git
       set :deploy_to, '/foo/bar'
     end
+
+    ENV.delete('COMMIT')
   end
 
   it 'has branch' do
@@ -44,6 +46,11 @@ describe 'git' do
         cli_execute 'deploy:update'
         config.should have_run('cd /foo/bar && git fetch origin && git reset --hard origin/master && git submodule init && git submodule -q sync && git submodule -q update')
       end
+
+      it 'updates to specific commit' do
+        cli_execute 'deploy:update', 'COMMIT=foobarbaz'
+        config.should have_run('cd /foo/bar && git fetch origin && git reset --hard foobarbaz')
+      end
     end
   end
 
@@ -58,6 +65,12 @@ describe 'git' do
     cli_execute 'deploy:pending'
   end
 
+  it 'shows pending against specific commit' do
+    config.should_receive(:current_revision) { 'baz' }
+    config.namespaces[:deploy].should_receive(:system).with('git log --pretty=medium --stat baz..foobarbaz')
+    cli_execute 'deploy:pending', 'COMMIT=foobarbaz'
+  end
+
   it 'sets forward agent' do
     config.ssh_options[:forward_agent].should == true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-deploy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-18 00:00:00.000000000 Z
+date: 2012-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2152294620 !ruby/object:Gem::Requirement
+  requirement: &2152701100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '2.9'
   type: :runtime
   prerelease: false
-  version_requirements: *2152294620
+  version_requirements: *2152701100
 description: 
 email:
 - just.lest@gmail.com
@@ -33,7 +33,6 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -73,7 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2795208972742122785
+      hash: 3055610007075838106
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -82,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2795208972742122785
+      hash: 3055610007075838106
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11

data/Gemfile.lock

@@ -1,41 +0,0 @@
-PATH
-  remote: .
-  specs:
-    capistrano-deploy (0.3.1)
-      capistrano (~> 2.9.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    capistrano (2.9.0)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
-    diff-lcs (1.1.3)
-    highline (1.6.9)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.2.2)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  capistrano-deploy!
-  rake
-  rspec