capistrano_recipes 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjk5MGRlOWM5NWU2MDU4MWRlMTExNTZlNmNkYzMxZjdlNmEzNjgxNA==
+    NDRmOTQyNTcxZDc0MjlkNjQ1NjEyOWQxNGM5NGU4YjY5MTg4YjZkYw==
   data.tar.gz: !binary |-
-    MzVlMWU0YmU2YTk4ZmQ2NjNjZWRlYzZhNjEyMWE4MzVjZmZhZWFjOQ==
+    YjU3MmE1MDNjYjdjMWM2MTA2NGMwN2YwY2Y5MDliNzQxNjg0MmI3Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjUwZjJiNmM1N2U2ODdmYWFkZWMyNzIwOWJmNzkyN2JmNzg5NGU0NjJiMzk4
-    MjJmMDNkNTVkODUxNWE1MGQ1NjE3ZWI4MzBlMjA2YTI5NGE1YWExZDg1Yzg0
-    MzgxZWY3ZGZlNzQ2OTY3M2YyY2U3NjdjNDVjNjVkZDM4MWMxMzI=
+    MGYxN2I0M2E0NDdmOWE0NjIzNWQwZmJkMDUxMTkxNzJhYTNiMTVlYTRlNmNi
+    OWRmNTEyN2FjNmVhZTA2ZTllYTFiYjRhM2I4MzMwZGE5NGUxMGY2MjZlNTc0
+    NzMxMWVlMDI1Yjg0NmQzNmE4NDcxMjhlODM3ZTUxY2UxZjhmN2I=
   data.tar.gz: !binary |-
-    ZWVlZjY3ZTMzMTg3MmIwMWVhODJiNTMyMTA1MzVjYmUwZDY2NGQ4YzEzZTdj
-    MjYzZmFlNzYwOTFhZDg0YTdhYzlhYThjZmU4NDVhYjY3ZTQwNmYwZjJmZTYy
-    YWJjM2YzMjNhNGE2MWNmYmUzMjQzMmI4ZTZhNDMxY2NhYzIzMDU=
+    OTEyNTY0N2FkOGNhY2U5MmRkOGM5MmFhNjg4MTE3ZmNlZTZhODZmMTE1ZWIz
+    MmY5OTk5N2MyYzA2MDVlZTkwMjlmZGFiOGU5MjU0ZTU2NTA3MDg1OTU5NmYw
+    MzkzYWFjOTNlMGYzZGM1ZDA4MGJhMDJlZTQ2ZTM4NDJhOTkzOWE=

data/README.md

@@ -11,7 +11,7 @@ For a single environment add:
 ```ruby
 require 'capistrano/recipes'
 
-use_recipes :bundler, :git, :rails_assets
+use_recipes :assets, :bundler, :git
 
 server 'Add your web server domain or ip here', :app, :web, :db, :primary => true
 
@@ -26,7 +26,7 @@ For a multistage environment add:
 ```ruby
 require 'capistrano/recipes'
 
-use_recipes :bundler, :git, :multistage, :rails_assets
+use_recipes :assets, :bundler, :git, :multistage
 
 stage :staging, :branch => :dev, :default => true do
   server 'Add your web server domain or ip here', :app, :web, :db, :primary => true
@@ -49,18 +49,18 @@ use_recipe :bundle
 
 To add multiple recipes:
 ```ruby
-use_recipes :bundle, :git, :multistage, :rails_assets
+use_recipes :assets, :bundle, :git, :multistage
 ```
 
 ## Recipes
 | Recipe        | Documentation |
 | ------------  | ------------- |
+| :assets       | [Assets recipe documentation](https://github.com/fernandoaleman/capistrano_recipes/wiki/Assets) |
 | :bundle       | [Bundle recipe documentation](https://github.com/fernandoaleman/capistrano_recipes/wiki/Bundle) |
 | :git          | [Git recipe documentation](https://github.com/fernandoaleman/capistrano_recipes/wiki/Git) |
 | :multistage   | [Multistage recipe documentation](https://github.com/fernandoaleman/capistrano_recipes/wiki/Multistage) |
 | :mysql        | [Mysql](https://github.com/fernandoaleman/capistrano_recipes/wiki/Mysql) |
 | :nginx        | [Nginx](https://github.com/fernandoaleman/capistrano_recipes/wiki/Nginx) |
-| :rails_assets | [Rails assets recipe documentation](https://github.com/fernandoaleman/capistrano_recipes/wiki/Rails-Assets) |
 | :unicorn      | [Unicorn](https://github.com/fernandoaleman/capistrano_recipes/wiki/Unicorn) |
 
 ## Installation

data/capistrano_recipes.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name          = 'capistrano_recipes'
-  s.version       = '1.0.1'
+  s.version       = '1.0.2'
   s.authors       = ['Fernando Aleman']
   s.email         = ['fernandoaleman@mac.com']
   s.description   = 'Capistrano recipes to make your deployments fast and easy'

data/lib/capistrano/recipes/{rails_assets.rb → assets.rb}

@@ -1,5 +1,5 @@
 module CapistranoRecipes
-  module RailsAssets
+  module Assets
     def self.load_into(configuration)
       configuration.load('deploy/assets')
     end

data/lib/capistrano/recipes/git.rb

@@ -17,9 +17,9 @@ module CapistranoRecipes
         set(:release_path)      { fetch(:current_path) }
         set(:releases_path)     { fetch(:current_path) }
         set(:current_release)   { fetch(:current_path) }
-        set(:current_revision)  { capture("cd #{deploy_to} && git rev-parse --short HEAD").strip }
-        set(:latest_revision)   { capture("cd #{deploy_to} && git rev-parse --short HEAD").strip }
-        set(:previous_revision) { capture("cd #{deploy_to} && git rev-parse --short HEAD@{1}").strip }
+        set(:current_revision)  { capture("cd #{current_path} && git rev-parse --short HEAD").strip }
+        set(:latest_revision)   { capture("cd #{current_path} && git rev-parse --short HEAD").strip }
+        set(:previous_revision) { capture("cd #{current_path} && git rev-parse --short HEAD@{1}").strip }
 
         set :local_branch do
           `git symbolic-ref HEAD 2> /dev/null`.strip.sub('refs/heads/', '')
@@ -45,13 +45,13 @@ module CapistranoRecipes
 
           desc 'Update the deployed code'
           task :update_code, :except => { :no_release => true } do
-            run "cd #{deploy_to} && git fetch origin && git reset --hard origin/#{branch}"
+            run "cd #{current_path} && git fetch origin && git reset --hard origin/#{branch}"
             finalize_update
           end
           
           desc 'Run migrations'
           task :migrate, :roles => :db, :only => { :primary => true } do
-            run "cd #{deploy_to} && RAILS_ENV=#{rails_env} #{rake} db:migrate"
+            run "cd #{current_path} && RAILS_ENV=#{rails_env} #{rake} db:migrate"
           end
 
           desc 'Deploy and run migrations'
@@ -70,7 +70,7 @@ module CapistranoRecipes
 
             desc 'Rewrite reflog so HEAD@{1} will continue to point to the next previous release'
             task :cleanup, :except => { :no_release => true } do
-              run "cd #{deploy_to}; git reflog delete --rewrite HEAD@{1}; git reflog delete --rewrite HEAD@{1}"
+              run "cd #{current_path}; git reflog delete --rewrite HEAD@{1}; git reflog delete --rewrite HEAD@{1}"
             end
 
             desc 'Roll back to the previously deployed version'

data/lib/capistrano/recipes/mysql.rb

@@ -67,7 +67,7 @@ module CapistranoRecipes
 
           desc 'Symlink the database.yml file into the latest deploy'
           task :symlink, :roles => :app, :except => { :no_release => true } do
-            run "ln -nfs #{mysql_remote_config} #{release_path}/config/database.yml"
+            run "ln -nfs #{mysql_remote_config_file} #{release_path}/config/database.yml"
           end
           after 'deploy:finalize_update', 'mysql:symlink'
 

data/lib/capistrano/recipes/templates/nginx.vhost.erb

@@ -27,25 +27,23 @@ server {
     break;
   }
 
-  location / {
-    # If the file exists as a static file, serve it directly
-    # without running all the other rewrite tests on it
-    if (-f $request_filename) {
-      break;
-    }
-
-    # Check for index.html
-    if (-f $request_filename/index.html) {
-      rewrite (.*) $1/index.html break;
-    }
-
-    # Check if .html file exists for page caching
-    if (-f $request_filename.html) {
-      rewrite (.*) $1.html break;
-    }
+  # If the file exists as a static file, serve it directly
+  # without running all the other rewrite tests on it
+  if (-f $request_filename) {
+    break;
+  }
+
+  # Check for index.html
+  if (-f $request_filename/index.html) {
+    rewrite (.*) $1/index.html break;
+  }
+
+  # Check if .html file exists for page caching
+  if (-f $request_filename.html) {
+    rewrite (.*) $1.html break;
   }
 
-<% if using_recipe?(:rails_assets) %>
+<% if using_recipe?(:assets) %>
   # Asset pipeline
   location ^~ /assets/ {
     gzip_static on;
@@ -93,25 +91,23 @@ server {
     break;
   }
 
-  location / {
-    # If the file exists as a static file, serve it directly
-    # without running all the other rewrite tests on it
-    if (-f $request_filename) {
-      break;
-    }
-
-    # Check for index.html
-    if (-f $request_filename/index.html) {
-      rewrite (.*) $1/index.html break;
-    }
-
-    # Check if .html file exists for page caching
-    if (-f $request_filename.html) {
-      rewrite (.*) $1.html break;
-    }
+  # If the file exists as a static file, serve it directly
+  # without running all the other rewrite tests on it
+  if (-f $request_filename) {
+    break;
+  }
+
+  # Check for index.html
+  if (-f $request_filename/index.html) {
+    rewrite (.*) $1/index.html break;
+  }
+
+  # Check if .html file exists for page caching
+  if (-f $request_filename.html) {
+    rewrite (.*) $1.html break;
   }
 
-<% if using_recipe?(:rails_assets) %>
+<% if using_recipe?(:assets) %>
   # Asset pipeline
   location ^~ /assets/ {
     gzip_static on;

data/lib/capistrano_recipes.rb

@@ -99,7 +99,7 @@ module CapistranoRecipes
 
           desc 'Setup servers for deployment'
           task :setup, :except => { :no_release => true } do
-            dirs = [deploy_to, releases_path, shared_path, config_path, backup_path]
+            dirs = [deploy_to, releases_path, shared_path, config_path, backup_path, pids_path, sockets_path]
             dirs += shared_children.map { |d| File.join(shared_path, d.split('/').last) }
             run "#{try_sudo} mkdir -p #{dirs.join(' ')}"
             run "#{try_sudo} chmod g+w #{dirs.join(' ')}" if fetch(:group_writable, true)

data/spec/{rails_assets.rb → assets.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe 'rails assets' do
+describe 'assets' do
   before do
     mock_config do
-      use_recipe :rails_assets
+      use_recipe :assets
       set :application, 'foo'
       set :deploy_to, '/foo/bar'
       set :latest_release, deploy_to

data/spec/git_spec.rb

@@ -35,13 +35,13 @@ describe 'git' do
     describe 'deploy:update' do
       it 'updates' do
         cli_execute 'deploy:update'
-        config.should have_run('cd /foo/bar && git fetch origin && git reset --hard origin/master')
+        config.should have_run('cd /foo/bar/current && git fetch origin && git reset --hard origin/master')
       end
     end
   end
 
   it 'has current revision' do
-    config.should_receive(:capture).with('cd /foo/bar && git rev-parse --short HEAD') { "baz\n" }
+    config.should_receive(:capture).with('cd /foo/bar/current && git rev-parse --short HEAD') { "baz\n" }
     config.current_revision.should == 'baz'
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_recipes
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Fernando Aleman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -68,26 +68,26 @@ files:
 - Rakefile
 - capistrano_recipes.gemspec
 - lib/capistrano/recipes.rb
+- lib/capistrano/recipes/assets.rb
 - lib/capistrano/recipes/bundle.rb
 - lib/capistrano/recipes/bundler.rb
 - lib/capistrano/recipes/git.rb
 - lib/capistrano/recipes/multistage.rb
 - lib/capistrano/recipes/mysql.rb
 - lib/capistrano/recipes/nginx.rb
-- lib/capistrano/recipes/rails_assets.rb
 - lib/capistrano/recipes/templates/mysql.yml.erb
 - lib/capistrano/recipes/templates/nginx.vhost.erb
 - lib/capistrano/recipes/templates/unicorn.rb.erb
 - lib/capistrano/recipes/templates/unicorn_init.erb
 - lib/capistrano/recipes/unicorn.rb
 - lib/capistrano_recipes.rb
+- spec/assets.rb
 - spec/bundle_spec.rb
 - spec/bundler_spec.rb
 - spec/git_spec.rb
 - spec/multistage_spec.rb
 - spec/mysql_spec.rb
 - spec/nginx_spec.rb
-- spec/rails_assets.rb
 - spec/spec_helper.rb
 - spec/unicorn_spec.rb
 homepage: https://github.com/fernandoaleman/capistrano_recipes
@@ -115,12 +115,12 @@ signing_key:
 specification_version: 4
 summary: Capistrano deployment recipes
 test_files:
+- spec/assets.rb
 - spec/bundle_spec.rb
 - spec/bundler_spec.rb
 - spec/git_spec.rb
 - spec/multistage_spec.rb
 - spec/mysql_spec.rb
 - spec/nginx_spec.rb
-- spec/rails_assets.rb
 - spec/spec_helper.rb
 - spec/unicorn_spec.rb