capistrano-rails 0.0.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3e8fe1523ecab9c8b2d4712403d2453226bda1d
-  data.tar.gz: 34eb72b078a2967aa6447102408dd81a15a389d6
+  metadata.gz: 50fc35b8cd9723dcb73171c9c666d6569eeb2e85
+  data.tar.gz: 73ed9253e148cc20700021781f6dc638a360d209
 SHA512:
-  metadata.gz: 325e9f1fffcfa4665491b4d064bbd3198fb4a601896673c1a7b6dc1181808ebaef6419b023c952bbcf6b5846debce8b2780e72935d80fc260e7ee824d1059adb
-  data.tar.gz: dfb240548e76a9b7f28bcef744f156ce35f138bc3fa8117b2f86f20de6b24537b626bb322303bf530506182e3b4808fb82b0bd5f6e99bffdb9cc28902fbaa98d
+  metadata.gz: d648704fa0fbbb0e001bb0f06d028ba764dcd0d41e7cc1772a036a99141a99af37717b0679787988d5d9310fe3c9c71af957bbaeb994a92fce72281fda1aee18
+  data.tar.gz: 872e46c1d0109dace75fd16b366fad09ecdba081a470ea1ef158754f29d8090f72bd57020e9f454553b137dad62b5ed8f0aaa732ee909498a8aed585476cddd5

data/README.md

@@ -5,14 +5,27 @@ Rails specific tasks for Capistrano v3:
   - `cap deploy:migrate`
   - `cap deploy:normalise_assets`
 
-Assumes that `RAILS_ENV` matches stage, tasks are currently early examples
+Tasks are currently early examples.
+
+Some rails specific options.
+
+```ruby
+set :rails_env, 'staging'       # If the environment differs from the stage
+set :migration_role, 'migrator' # Defaults to 'db'
+```
+
+If you need to touch `public/images`, `public/javascripts` and `public/stylesheets` on each deploy:
+
+```ruby
+set :normalize_asset_timestamps, %{public/images public/javascripts public/stylesheets}
+```
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'capistrano', version: '~> 3.0.0'
-    gem 'capistrano-rails', version: '~> 1.0.0'
+    gem 'capistrano',  '~> 3.0.0'
+    gem 'capistrano-rails'
 
 And then execute:
 

data/capistrano-rails.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "capistrano-rails"
-  gem.version       = '0.0.7'
+  gem.version       = '1.0.0'
   gem.authors       = ["Tom Clements", "Lee Hambley"]
   gem.email         = ["seenmyfate@gmail.com", "lee.hambley@gmail.com"]
   gem.description   = %q{Rails specific Capistrano tasks}

data/lib/capistrano/rails.rb

@@ -1,2 +1,4 @@
+load File.expand_path("../tasks/rails.rake", __FILE__)
+
 require 'capistrano/rails/assets'
 require 'capistrano/rails/migrations'

data/lib/capistrano/tasks/assets.rake

@@ -11,9 +11,11 @@ namespace :deploy do
   desc 'Normalise asset timestamps'
   task :normalise_assets do
     on roles :web do
-      within release_path do
-        assets = %{public/images public/javascripts public/stylesheets}
-        execute :find, "#{assets} -exec touch -t #{asset_timestamp} {} ';'; true"
+      assets = fetch(:normalize_asset_timestamps)
+      if assets
+        within release_path do
+          execute :find, "#{assets} -exec touch -t #{asset_timestamp} {} ';'; true"
+        end
       end
     end
   end
@@ -24,11 +26,14 @@ namespace :deploy do
     invoke 'deploy:assets:backup_manifest'
   end
 
+  # FIXME: it removes every asset it has just compiled
   desc 'Cleanup expired assets'
   task :cleanup_assets do
     on roles :web do
       within release_path do
-        execute :rake, "assets:clean RAILS_ENV=#{fetch(:stage)}"
+        with rails_env: fetch(:rails_env) do
+          execute :rake, "assets:clean"
+        end
       end
     end
   end
@@ -43,7 +48,8 @@ namespace :deploy do
   end
 
   after 'deploy:updated', 'deploy:compile_assets'
-  after 'deploy:updated', 'deploy:cleanup_assets'
+  # NOTE: we don't want to remove assets we've just compiled
+  # after 'deploy:updated', 'deploy:cleanup_assets'
   after 'deploy:updated', 'deploy:normalise_assets'
   after 'deploy:reverted', 'deploy:rollback_assets'
 
@@ -51,7 +57,9 @@ namespace :deploy do
     task :precompile do
       on roles :web do
         within release_path do
-          execute :rake, "assets:precompile RAILS_ENV=#{fetch(:stage)}"
+          with rails_env: fetch(:rails_env) do
+            execute :rake, "assets:precompile"
+          end
         end
       end
     end
@@ -60,8 +68,8 @@ namespace :deploy do
       on roles :web do
         within release_path do
           execute :cp,
-            release_path.join('public', 'assets', 'manifest*.json'),
-            release_path.join('assets_manifest_backup.json')
+            release_path.join('public', 'assets', 'manifest*'),
+            release_path.join('assets_manifest_backup')
         end
       end
     end
@@ -69,7 +77,7 @@ namespace :deploy do
     task :restore_manifest do
       on roles :web do
         within release_path do
-          source = release_path.join('assets_manifest_backup.json')
+          source = release_path.join('assets_manifest_backup')
           target = capture(:ls, release_path.join('public', 'assets',
                                                   'manifest*')).strip
           if test "[[ -f #{source} && -f #{target} ]]"

data/lib/capistrano/tasks/migrations.rake

@@ -2,9 +2,11 @@ namespace :deploy do
 
   desc 'Runs rake db:migrate if migrations are set'
   task :migrate do
-    on primary :db do
+    on primary fetch(:migration_role) do
       within release_path do
-        execute :rake, "db:migrate RAILS_ENV=#{fetch(:stage)}"
+        with rails_env: fetch(:rails_env) do
+          execute :rake, "db:migrate"
+        end
       end
     end
   end
@@ -12,3 +14,8 @@ namespace :deploy do
   after 'deploy:updated', 'deploy:migrate'
 end
 
+namespace :load do
+  task :defaults do
+    set :migration_role, fetch(:migration_role, :db)
+  end
+end

data/lib/capistrano/tasks/rails.rake

@@ -0,0 +1,5 @@
+namespace :deploy do
+  before :starting, :set_rails_env do
+    set :rails_env, (fetch(:rails_env) || fetch(:stage))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Tom Clements
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -45,6 +45,7 @@ files:
 - lib/capistrano/rails/migrations.rb
 - lib/capistrano/tasks/assets.rake
 - lib/capistrano/tasks/migrations.rake
+- lib/capistrano/tasks/rails.rake
 homepage: https://github.com/capistrano/rails
 licenses: []
 metadata: {}
@@ -69,4 +70,3 @@ signing_key:
 specification_version: 4
 summary: Rails specific Capistrano tasks
 test_files: []
-has_rdoc: