capistrano-deploy 0.2.2 → 0.3.0

data/.gitignore

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

data/.travis.yml

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-deploy (0.2.2)
+    capistrano-deploy (0.3.0)
       capistrano (~> 2.9.0)
 
 GEM
@@ -14,23 +14,23 @@ GEM
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
     diff-lcs (1.1.3)
-    highline (1.6.5)
+    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.1)
+    net-ssh (2.2.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     rake (0.9.2.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    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.6.0)
+    rspec-mocks (2.8.0)
 
 PLATFORMS
   ruby

data/MIT-LICENSE

@@ -0,0 +1,19 @@
+Copyright (C) 2012 Sergey Nartimov
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,18 +1,22 @@
-Capistrano deploy recipes
+Capistrano deploy recipes [![TravisCI](https://secure.travis-ci.org/lest/capistrano-deploy.png?branch=master)](http://travis-ci.org/lest/capistrano-deploy)
 =========================
 
-Git & Rails
------------
+Inspired by https://github.com/blog/470-deployment-script-spring-cleaning.
+
+Quickstart with Git and Rails
+-----------------------------
 
 Minimal Capfile for Rails deploy using Git:
 
-    require 'capistrano-deploy'
-    use_recipes :git, :rails
+```ruby
+require 'capistrano-deploy'
+use_recipes :git, :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'
+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'
+```
 
 To setup:
 
@@ -22,60 +26,98 @@ Then when you push some changes to git repository simply run:
 
     cap deploy
 
-If you have migrations instead of previous command run:
+Or if you have migrations:
 
     cap deploy:migrations
 
-To look through changes to be deployed:
+To look through the changes to be deployed:
 
     cap deploy:pending
 
 Multistage
 ----------
 
-    use_recipe :multistage
+Basic usage:
+
+```ruby
+use_recipe :multistage
+
+set :default_stage, :development
+
+stage :development do
+  ...
+end
+
+stage :production do
+  ...
+end
+```
 
-    set :default_stage, :development
+You can also pass options that allow setting variables and default stage:
 
-    define_stage :development do
-      ...
-    end
+```ruby
+stage :development, :branch => :develop, :default => true
+stage :production,  :branch => :master
+```
 
-    define_stage :production do
-      ...
-    end
+When branches are specified for stages and git recipe is used
+it will automatically select stage based on current local branch.
 
 Bundle
 ------
 
-    use_recipe :bundle
+Use recipe:
 
-To automatically install missing gems:
+```ruby
+use_recipe :bundle
+```
 
-    after 'deploy:update', 'bundle:install'
+And add callback to run `bundle install` on each deploy:
+
+```ruby
+after 'deploy:update', 'bundle:install'
+```
 
 Passenger
 ---------
 
-    use_recipe :passenger
+Use recipe:
+
+```ruby
+use_recipe :passenger
+```
+
+It will automatically do `touch tmp/restart.txt` on each deploy.
 
 Unicorn
 -------
 
-    use_recipe :unicorn
+Use recipe:
 
-Now you can setup to reload unicorn on `deploy:restart`:
+```ruby
+use_recipe :unicorn
+```
 
-    after 'deploy:restart', 'unicorn:reload'
+You can setup callback to reload unicorn after deploy is done:
+
+```ruby
+after 'deploy:restart', 'unicorn:reload'
+```
 
 Whenever
 --------
 
-    use_recipe :whenever
+Use recipe:
+
+```ruby
+use_recipe :whenever
+```
 
 To automatically update crontab file:
 
-    after 'deploy:restart', 'whenever:update_crontab'
+```ruby
+after 'deploy:restart', 'whenever:update_crontab'
+```
 
 You can also clear crontab file with command:
 

data/capistrano-deploy.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'capistrano-deploy'
-  s.version     = '0.2.2'
+  s.version     = '0.3.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Sergey Nartimov']
   s.email       = ['just.lest@gmail.com']

data/lib/capistrano-deploy.rb

@@ -1,17 +1,25 @@
+require 'capistrano'
+
 module CapistranoDeploy
   def self.load_into(configuration)
     configuration.load do
       @used_recipes = []
 
-      (class << self; self; end).class_eval do
+      class << self
         attr_reader :used_recipes
+      end
 
-        define_method :use_recipe do |recipe_name|
-          @used_recipes << recipe_name.to_sym
+      def use_recipe(recipe_name)
+        return if @used_recipes.include?(recipe_name.to_sym)
 
+        begin
           require "capistrano-deploy/#{recipe_name}"
+
           recipe = CapistranoDeploy.const_get(recipe_name.to_s.capitalize.gsub(/_(\w)/) { $1.upcase })
-          recipe.load_into(configuration)
+          recipe.load_into(self)
+          @used_recipes << recipe.to_s.split('::').last.downcase.to_sym
+        rescue LoadError
+          abort "Are you misspelled `#{recipe_name}` recipe name?"
         end
       end
 

data/lib/capistrano-deploy/bundler.rb

@@ -0,0 +1,2 @@
+require 'capistrano-deploy/bundle'
+CapistranoDeploy::Bundler = CapistranoDeploy::Bundle

data/lib/capistrano-deploy/git.rb

@@ -11,6 +11,10 @@ module CapistranoDeploy
 
         set(:current_revision) { capture("cd #{deploy_to} && git rev-parse HEAD").chomp }
 
+        set :local_branch do
+          `git symbolic-ref HEAD 2> /dev/null`.strip.sub('refs/heads/', '')
+        end
+
         namespace :deploy do
           desc 'Setup'
           task :setup, :except => {:no_release => true} do

data/lib/capistrano-deploy/multistage.rb

@@ -2,24 +2,37 @@ module CapistranoDeploy
   module Multistage
     def self.load_into(configuration)
       configuration.load do
-        set :multistage_stages, []
+        set :multistage_config, Config.new(configuration)
 
-        def define_stage(name, &block)
-          multistage_stages << name
+        def define_stage(*args, &block)
+          warn "[DEPRECATION] `define_stage` is deprecated, use `stage` instead"
+          stage(*args, &block)
+        end
+
+        def stage(name, options={}, &block)
+          set :default_stage, name.to_sym if options.delete(:default)
+          multistage_config.stage(name, options)
           callbacks[:start].detect { |c| c.source == 'multistage:ensure' }.except << name.to_s
+
           task(name) do
-            set :stage, name.to_s
-            block.call
+            set :current_stage, name.to_s
+            options.each do |k, v|
+              set k, v if v
+            end
+            block.call if block
           end
         end
 
         namespace :multistage do
           task :ensure do
-            unless exists?(:stage)
-              if exists?(:default_stage)
+            unless exists?(:current_stage)
+              if stage = multistage_config.inferred_stage
+                find_and_execute_task(stage.name)
+              elsif exists?(:default_stage)
                 find_and_execute_task(default_stage)
               else
-                abort "No stage specified. Please specify one of: #{multistage_stages.join(', ')} (e.g. `cap #{multistage_stages.first} #{ARGV.last}')"
+                stage_names = multistage_config.stages.map(&:name)
+                abort "No stage specified. Please specify one of: #{stage_names.join(', ')} (e.g. `cap #{stage_names.first} #{ARGV.last}')"
               end
             end
           end
@@ -28,5 +41,37 @@ module CapistranoDeploy
         on :start, 'multistage:ensure'
       end
     end
+
+    # Handles multistage configuration
+    class Config
+      attr_reader :config
+      attr_reader :stages
+
+      def initialize(config)
+        @config = config
+        @stages = []
+      end
+
+      def stage(name, options={})
+        stages << Stage.new(name, options)
+      end
+
+      def inferred_stage
+        if config.using_recipe?(:git)
+          branch = config.local_branch
+          stages.find { |stage| stage.options[:branch].to_s == branch }
+        end
+      end
+    end
+
+    class Stage
+      attr_reader :name
+      attr_reader :options
+
+      def initialize(name, options={})
+        @name    = name
+        @options = options
+      end
+    end
   end
 end

data/lib/capistrano-deploy/rails_assets.rb

@@ -0,0 +1,25 @@
+module CapistranoDeploy
+  module RailsAssets
+    def self.load_into(configuration)
+      configuration.load do
+        use_recipe :rails
+
+        namespace :deploy do
+          namespace :assets do
+            desc 'Precompile assets'
+            task :precompile do
+              run "cd #{deploy_to} && RAILS_ENV=#{rails_env} RAILS_GROUPS=assets #{rake} assets:precompile"
+            end
+
+            desc 'Clean assets'
+            task :clean do
+              run "cd #{deploy_to} && RAILS_ENV=#{rails_env} RAILS_GROUPS=assets #{rake} assets:clean"
+            end
+          end
+        end
+
+        after 'deploy:update', 'deploy:assets:precompile'
+      end
+    end
+  end
+end

data/lib/capistrano-deploy/rvm.rb

@@ -2,8 +2,18 @@ module CapistranoDeploy
   module Rvm
     def self.load_into(configuration)
       configuration.load do
-        $:.unshift(File.expand_path('./lib', ENV['rvm_path']))
-        require 'rvm/capistrano'
+        set :rvm_ruby_string, 'default'
+        set :rvm_path, '/usr/local/rvm'
+
+        set(:rvm_shell_path) { "#{rvm_path}/bin/rvm-shell" }
+
+        set :default_shell do
+          shell = rvm_shell_path
+          ruby  = rvm_ruby_string.to_s.strip
+          shell = "rvm_path=#{rvm_path} #{shell} '#{ruby}'" unless ruby.empty?
+
+          shell
+        end
 
         if File.exists?('.rvmrc')
           matches = File.read('.rvmrc').scan(/^rvm\s+use\s+.*?([\w\-\.]+@[\w\-]+).*$/)

data/lib/capistrano-deploy/whenever.rb

@@ -12,7 +12,7 @@ module CapistranoDeploy
 
         set :whenever_identifier do
           if using_recipe?(:multistage)
-            "#{application}_#{stage}"
+            "#{application}_#{current_stage}"
           else
             application
           end

data/spec/bundle_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe 'bundler' do
+  before do
+    mock_config do
+      use_recipes :bundler
+      set :deploy_to, '/foo/bar'
+    end
+  end
+
+  it 'uses bundler alias for bundle recipe' do
+    config.used_recipes.should == [:bundle]
+  end
+end

data/spec/deploy_spec.rb

@@ -2,7 +2,10 @@ require 'spec_helper'
 
 describe 'deploy' do
   before do
-    mock_config { use_recipes :git, :rails }
+    mock_config do
+      use_recipes :git, :rails
+      set :deploy_to, '/foo/bar'
+    end
   end
 
   it 'returns used recipes' do
@@ -14,11 +17,22 @@ describe 'deploy' do
     config.should_not be_using_recipe(:bundle)
   end
 
+  it 'uses recipe once' do
+    config.use_recipe :git
+    config.used_recipes.should == [:git, :rails]
+  end
+
+  it 'aborts when recipe name misspelled' do
+    with_stderr do |output|
+      expect { config.use_recipe(:rvn) }.to raise_error(SystemExit)
+      output.should include('Are you misspelled `rvn` recipe name?')
+    end
+  end
+
   describe 'deploy' do
     it 'runs update and restart' do
-      config.namespaces[:deploy].should_receive(:update)
-      config.namespaces[:deploy].should_receive(:restart)
       cli_execute 'deploy'
+      config.should have_executed('deploy:update', 'deploy:restart')
     end
   end
 end

data/spec/git_spec.rb

@@ -2,7 +2,10 @@ require 'spec_helper'
 
 describe 'git' do
   before do
-    mock_config { use_recipe :git; set :deploy_to, '/foo/bar' }
+    mock_config do
+      use_recipe :git
+      set :deploy_to, '/foo/bar'
+    end
   end
 
   it 'has branch' do

data/spec/multistage_spec.rb

@@ -6,14 +6,9 @@ describe 'multistage' do
       use_recipes :multistage
 
       set :default_stage, :development
-
-      define_stage :development do
-        set :foo, 'bar'
-      end
-
-      define_stage :production do
-        set :foo, 'baz'
-      end
+      stage(:development, :branch => 'develop') { set :foo, 'bar' }
+      stage(:production,  :branch => 'master')  { set :foo, 'baz' }
+      stage :another_stage, :foo => 'bar'
 
       task(:example) {}
     end
@@ -21,13 +16,51 @@ describe 'multistage' do
 
   it 'uses default stage' do
     cli_execute 'example'
-    config.stage.should == 'development'
+    config.current_stage.should == 'development'
     config.foo.should == 'bar'
   end
 
+  it 'aborts when no stage selected' do
+    with_stderr do |output|
+      config.unset :default_stage
+      expect { cli_execute 'example' }.to raise_error(SystemExit)
+      output.should include('No stage specified. Please specify one of: development, production')
+    end
+  end
+
   it 'uses specified stage' do
     cli_execute %w[production example]
-    config.stage.should == 'production'
+    config.current_stage.should == 'production'
     config.foo.should == 'baz'
   end
+
+  it 'sets variables from options' do
+    cli_execute 'another_stage'
+    config.foo.should == 'bar'
+  end
+
+  it 'accepts default option' do
+    mock_config { stage :to_be_default, :default => true }
+    config.default_stage.should == :to_be_default
+  end
+
+  context 'with git' do
+    before do
+      mock_config { use_recipe :git }
+    end
+
+    it 'infers stage using local branch' do
+      config.stub(:local_branch) { 'master' }
+      cli_execute 'example'
+      config.current_stage.should == 'production'
+      config.branch.should == 'master'
+    end
+
+    it 'uses default state when local branch not matches' do
+      config.stub(:local_branch) { 'foo' }
+      cli_execute 'example'
+      config.current_stage.should == 'development'
+      config.branch.should == 'develop'
+    end
+  end
 end

data/spec/passenger_spec.rb

@@ -13,12 +13,10 @@ describe 'passenger' do
       cli_execute 'passenger:restart'
       config.should have_run('touch /foo/bar/tmp/restart.txt')
     end
-  end
 
-  describe 'deploy:restart' do
-    it 'touches tmp/restart.txt' do
+    it 'is executed after deploy:restart' do
       cli_execute 'deploy:restart'
-      config.should have_run('touch /foo/bar/tmp/restart.txt')
+      config.should have_executed('deploy:restart', 'passenger:restart')
     end
   end
 end

data/spec/rails_assets_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe 'rails assets' do
+  before do
+    mock_config do
+      use_recipe :rails_assets
+      set :deploy_to, '/foo/bar'
+    end
+  end
+
+  it 'uses rails recipe' do
+    config.should be_using_recipe(:rails)
+  end
+
+  describe 'deploy:assets:precompile' do
+    it 'runs precompile' do
+      cli_execute 'deploy:assets:precompile'
+      config.should have_run('cd /foo/bar && RAILS_ENV=production RAILS_GROUPS=assets rake assets:precompile')
+    end
+
+    it 'uses bundle command' do
+      mock_config { use_recipe :bundle }
+      cli_execute 'deploy:assets:precompile'
+      config.should have_run('cd /foo/bar && RAILS_ENV=production RAILS_GROUPS=assets bundle exec rake assets:precompile')
+    end
+
+    it 'is invoked after deploy:update' do
+      cli_execute 'deploy:update'
+      config.should have_executed('deploy:update', 'deploy:assets:precompile')
+    end
+  end
+
+  describe 'deploy:assets:clean' do
+    it 'runs clean' do
+      cli_execute 'deploy:assets:clean'
+      config.should have_run('cd /foo/bar && RAILS_ENV=production RAILS_GROUPS=assets rake assets:clean')
+    end
+  end
+end

data/spec/rails_spec.rb

@@ -2,14 +2,13 @@ require 'spec_helper'
 
 describe 'rails' do
   before do
-    mock_config { use_recipe :rails }
+    mock_config do
+      use_recipe :rails
+      set :deploy_to, '/foo/bar'
+    end
   end
 
   describe 'deploy:migrate' do
-    before do
-      mock_config { set :deploy_to, '/foo/bar' }
-    end
-
     it 'runs rake db:migrate' do
       cli_execute 'deploy:migrate'
       config.should have_run('cd /foo/bar && RAILS_ENV=production rake db:migrate')
@@ -24,10 +23,8 @@ describe 'rails' do
 
   describe 'deploy:migrations' do
     it 'runs update, migrate and restart' do
-      config.namespaces[:deploy].should_receive(:update)
-      config.namespaces[:deploy].should_receive(:migrate)
-      config.namespaces[:deploy].should_receive(:restart)
       cli_execute 'deploy:migrations'
+      config.should have_executed('deploy:update', 'deploy:migrate', 'deploy:restart')
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,16 +1,24 @@
-require 'capistrano'
-require 'capistrano/cli'
 require 'capistrano-deploy'
+require 'capistrano/cli'
 
 module CapistranoDeploy
   module Spec
     module ConfigurationExtension
       def run(cmd, options={}, &block)
-        runs[cmd] = {:options => options, :block => block}
+        runned_commands[cmd] = {:options => options, :block => block}
+      end
+
+      def execute_task(task)
+        executed_tasks << task.fully_qualified_name
+        super
+      end
+
+      def runned_commands
+        @runned_commands ||= {}
       end
 
-      def runs
-        @runs ||= {}
+      def executed_tasks
+        @executed_tasks ||= []
       end
     end
 
@@ -31,16 +39,30 @@ module CapistranoDeploy
 
       def cli_execute(*args)
         config = @config
-        cli = Capistrano::CLI.parse(args.flatten).tap do |cli|
-          cli.instance_eval do
-            (class << self; self; end).send(:define_method, :instantiate_configuration) do |options|
-              config
-            end
+        cli = Capistrano::CLI.parse(args.flatten)
+        cli.instance_eval do
+          (class << self; self end).send(:define_method, :instantiate_configuration) do |options|
+            config
           end
         end
 
         cli.execute!
       end
+
+      def with_stderr
+        original, $stderr = $stderr, StringIO.new
+        output = Object.new
+        class << output
+          instance_methods.each { |m| undef_method m unless m =~ /^__|^object_id$|^instance_eval$/ }
+        end
+        def output.method_missing(*args, &block)
+          ($stderr.rewind && $stderr.read).__send__(*args, &block)
+        end
+
+        yield output
+      ensure
+        $stderr = original
+      end
     end
 
     module Matchers
@@ -48,11 +70,26 @@ module CapistranoDeploy
 
       define :have_run do |cmd|
         match do |configuration|
-          configuration.runs[cmd]
+          configuration.runned_commands[cmd]
+        end
+
+        failure_message_for_should do |configuration|
+          "expected configuration to run #{cmd}, but it wasn't found in #{configuration.runned_commands.keys}"
+        end
+      end
+
+      define :have_executed do |*tasks|
+        match do |configuration|
+          expected = tasks.dup
+          configuration.executed_tasks.each do |actual|
+            expected.shift if actual == expected.first
+          end
+
+          expected.empty?
         end
 
         failure_message_for_should do |configuration|
-          "expected configuration to run #{cmd}, but it wasn't found in #{configuration.runs.keys}"
+          "expected configuration to execute #{tasks}, but it executed #{configuration.executed_tasks.keys}"
         end
       end
     end

data/spec/unicorn_spec.rb

@@ -15,17 +15,17 @@ describe 'unicorn' do
       mock_config { set :unicorn_pid, '/foo.pid' }
     end
 
-    it 'reload' do
+    it 'sends HUP' do
       cli_execute 'unicorn:reload'
       config.should have_run('kill -HUP /foo.pid')
     end
 
-    it 'stop' do
+    it 'sends QUIT' do
       cli_execute 'unicorn:stop'
       config.should have_run('kill -QUIT /foo.pid')
     end
 
-    it 'reexec' do
+    it 'sends USR2' do
       cli_execute 'unicorn:reexec'
       config.should have_run('kill -USR2 /foo.pid')
     end

data/spec/whenever_spec.rb

@@ -17,9 +17,32 @@ describe 'whenever' do
     it 'default to application with stage when using multistage' do
       mock_config do
         use_recipe :multistage
-        set :stage, 'bar'
+        set :current_stage, 'bar'
       end
       config.whenever_identifier.should == 'foo_bar'
     end
   end
+
+  describe 'whenever_cmd' do
+    it 'has default value' do
+      config.whenever_cmd.should == 'whenever'
+    end
+
+    it 'respects bundle recipe' do
+      mock_config { use_recipe :bundle }
+      config.whenever_cmd.should == 'bundle exec whenever'
+    end
+  end
+
+  describe 'whenever:update_crontab' do
+    it 'runs command' do
+      mock_config do
+        set :deploy_to, '/foo/bar'
+        set :whenever_cmd, 'wc'
+        set :whenever_identifier, 'wi'
+      end
+      cli_execute 'whenever:update_crontab'
+      config.should have_run('cd /foo/bar && wc --update-crontab wi')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-04 00:00:00.000000000 Z
+date: 2012-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2157534600 !ruby/object:Gem::Requirement
+  requirement: &15867460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 2.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157534600
+  version_requirements: *15867460
 description: 
 email:
 - just.lest@gmail.com
@@ -31,25 +31,30 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
+- MIT-LICENSE
 - README.md
 - Rakefile
 - capistrano-deploy.gemspec
 - lib/capistrano-deploy.rb
 - lib/capistrano-deploy/bundle.rb
-- lib/capistrano-deploy/deploy.rb
+- lib/capistrano-deploy/bundler.rb
 - lib/capistrano-deploy/git.rb
 - lib/capistrano-deploy/multistage.rb
 - lib/capistrano-deploy/passenger.rb
 - lib/capistrano-deploy/rails.rb
+- lib/capistrano-deploy/rails_assets.rb
 - lib/capistrano-deploy/rvm.rb
 - lib/capistrano-deploy/unicorn.rb
 - lib/capistrano-deploy/whenever.rb
+- spec/bundle_spec.rb
 - spec/deploy_spec.rb
 - spec/git_spec.rb
 - spec/multistage_spec.rb
 - spec/passenger_spec.rb
+- spec/rails_assets_spec.rb
 - spec/rails_spec.rb
 - spec/spec_helper.rb
 - spec/unicorn_spec.rb
@@ -68,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1789516116924546670
+      hash: -3624144912279790165
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -77,18 +82,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1789516116924546670
+      hash: -3624144912279790165
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Capistrano deploy recipes
 test_files:
+- spec/bundle_spec.rb
 - spec/deploy_spec.rb
 - spec/git_spec.rb
 - spec/multistage_spec.rb
 - spec/passenger_spec.rb
+- spec/rails_assets_spec.rb
 - spec/rails_spec.rb
 - spec/spec_helper.rb
 - spec/unicorn_spec.rb

data/lib/capistrano-deploy/deploy.rb

@@ -1,65 +0,0 @@
-warn "[DEPRECATION] require 'capistrano-deploy/deploy' is deprecated.  Please use require 'capistrano-deploy' and use_recipes :git, :rails instead."
-
-Capistrano::Configuration.instance(:must_exist).load do
-  ssh_options[:forward_agent] = true
-
-  set(:application) { repository.slice(/[^\/:]+?(?=\.git$)/) }
-  set(:repository) { abort "Please specify repository, set :repository, 'foo'" }
-  set(:deploy_to) { abort "Please specify deploy directory, set :deploy_to, '/deploy/to/path'" }
-
-  set :branch, 'master'
-
-  set :enable_submodules, false
-
-  set(:current_revision) { capture("cd #{deploy_to} && git rev-parse HEAD").chomp }
-
-  namespace :deploy do
-    desc 'Deploy'
-    task :default do
-      update
-      restart
-    end
-
-    desc 'Deploy & migrate'
-    task :migrations do
-      update_code
-      migrate
-      restart
-    end
-
-    desc 'Setup'
-    task :setup, :except => {:no_release => true} do
-      run "mkdir -p `dirname #{deploy_to}` && git clone --no-checkout #{repository} #{deploy_to}"
-      update_code
-    end
-
-    desc 'Update'
-    task :update do
-      update_code
-    end
-
-    desc 'Update the deployed code'
-    task :update_code, :except => {:no_release => true} do
-      command = ["cd #{deploy_to}", 'git fetch origin', "git reset --hard origin/#{branch}"]
-      command += ['git submodule init', 'git submodule -q sync', 'git submodule -q update'] if enable_submodules
-      run command.join(' && ')
-    end
-
-    desc 'Run migrations'
-    task :migrate, :roles => :db, :only => {:primary => true} do
-      rake = fetch(:rake, 'rake')
-      rails_env = fetch(:rails_env, 'production')
-      run "cd #{deploy_to} && RAILS_ENV=#{rails_env} #{rake} db:migrate"
-    end
-
-    desc 'Restart'
-    task :restart do
-      # nothing
-    end
-
-    desc 'Show pending commits'
-    task :pending do
-      system("git log --pretty=medium --stat #{current_revision}..origin/#{branch}")
-    end
-  end
-end