capistrano-rails 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ecc06faeb5c6951f9b1dfcfafb26d2cbd75cfb6
-  data.tar.gz: 7d16b1965fcd7d08b459dfa94f019e4e4b067936
+  metadata.gz: 7065170b7a368f7095b8c03cb8c1cf79351a1cc6
+  data.tar.gz: e15b821f871fd65299ba87df3b46daa099efcf5f
 SHA512:
-  metadata.gz: f128f8adb2ec46f5be5b6f5e951eb7b6585c15ac5f4f57aed4bafe0f543cf2b4750852411c30912b48b960eaea06e98bb0c5a381daa470fca71f1a39e1451ba9
-  data.tar.gz: fdbd6eb29c0b3d41fc144078869431596df9e9cb2cca9e7e65f4fa8ecdd5da254a4b161f89d23ac8f25e750c88ad6f20ecc7614d2dcde57ba95ccb8a3d560a5d
+  metadata.gz: 97634bcd7e7a043c3bc1f0bcc0f8ea21a0704a904cd02501eabd88cc0e602f375b3d522330b97375e20c00408b353141018e6e0fea543448bfc47f53123b99e9
+  data.tar.gz: dd80fa91b3b846cb78a13484e29cce1a7a86b412a0f07dec191becf8fd80c62fc7c035c96f01b670b1552ee9c7b256f667f5d99c6082b1266fe068697a56cb25

data/CHANGELOG.md

@@ -1,6 +1,8 @@
-# future release
+# 1.1.3 (Apr 18 2015)
 
-* ready for contributors
+* Fixed no_release behaviour (https://github.com/capistrano/rails/pull/95)
+* Allow assets manifest backup with folder "manifests" (https://github.com/capistrano/rails/pull/92)
+* Handle Sprocket 3 manifest filename
 
 # 1.1.2 (Sep 1 2014)
 

data/README.md

@@ -10,7 +10,7 @@ Some rails specific options.
 ```ruby
 set :rails_env, 'staging'                  # If the environment differs from the stage name
 set :migration_role, 'migrator'            # Defaults to 'db'
-set :conditionally_migrate, true           # Defaults to false
+set :conditionally_migrate, true           # Defaults to false. If true, it's skip migration if files in db/migrate not modified
 set :assets_roles, [:web, :app]            # Defaults to [:web]
 set :assets_prefix, 'prepackaged-assets'   # Defaults to 'assets' this should match config.assets.prefix in your rails config/application.rb
 ```
@@ -41,9 +41,18 @@ Or require just what you need manually:
     require 'capistrano/bundler' # Rails needs Bundler, right?
     require 'capistrano/rails/assets'
     require 'capistrano/rails/migrations'
-    
+
 Please note that any `require` should be placed in `Capfile`, not `config/deploy.rb`.
 
+### Symlinks
+
+You'll probably want to symlink Rails shared files and directories like `log`, `tmp` and `public/uploads`.
+Make sure you enable it by setting `linked_dirs` and `linked_files` options:
+
+    # deploy.rb
+    set :linked_dirs, fetch(:linked_dirs, []).push('log', 'tmp/pids', 'tmp/cache', 'tmp/sockets', 'vendor/bundle', 'public/system', 'public/uploads')
+    set :linked_files, fetch(:linked_files, []).push('config/database.yml', 'config/secrets.yml')
+
 ## Contributing
 
 1. Fork it

data/capistrano-rails.gemspec

@@ -4,9 +4,9 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "capistrano-rails"
-  gem.version       = '1.1.2'
-  gem.authors       = ["Tom Clements", "Lee Hambley"]
-  gem.email         = ["seenmyfate@gmail.com", "lee.hambley@gmail.com"]
+  gem.version       = '1.1.3'
+  gem.authors       = ["Tom Clements", "Lee Hambley", "Kir Shatrov"]
+  gem.email         = ["seenmyfate@gmail.com", "lee.hambley@gmail.com", "shatrov@me.com"]
   gem.description   = %q{Rails specific Capistrano tasks}
   gem.summary       = %q{Rails specific Capistrano tasks}
   gem.homepage      = "https://github.com/capistrano/rails"

data/lib/capistrano/tasks/assets.rake

@@ -8,7 +8,7 @@ end
 namespace :deploy do
   desc 'Normalize asset timestamps'
   task :normalize_assets => [:set_rails_env] do
-    on roles(fetch(:assets_roles)) do
+    on release_roles(fetch(:assets_roles)) do
       assets = fetch(:normalize_asset_timestamps)
       if assets
         within release_path do
@@ -27,7 +27,7 @@ namespace :deploy do
   # FIXME: it removes every asset it has just compiled
   desc 'Cleanup expired assets'
   task :cleanup_assets => [:set_rails_env] do
-    on roles(fetch(:assets_roles)) do
+    on release_roles(fetch(:assets_roles)) do
       within release_path do
         with rails_env: fetch(:rails_env) do
           execute :rake, "assets:clean"
@@ -53,7 +53,7 @@ namespace :deploy do
 
   namespace :assets do
     task :precompile do
-      on roles(fetch(:assets_roles)) do
+      on release_roles(fetch(:assets_roles)) do
         within release_path do
           with rails_env: fetch(:rails_env) do
             execute :rake, "assets:precompile"
@@ -63,21 +63,23 @@ namespace :deploy do
     end
 
     task :backup_manifest do
-      on roles(fetch(:assets_roles)) do
+      on release_roles(fetch(:assets_roles)) do
         within release_path do
+          backup_path = release_path.join('assets_manifest_backup')
+
+          execute :mkdir, '-p', backup_path
           execute :cp,
-            release_path.join('public', fetch(:assets_prefix), 'manifest*'),
-            release_path.join('assets_manifest_backup')
+            detect_manifest_path,
+            backup_path
         end
       end
     end
 
     task :restore_manifest do
-      on roles(fetch(:assets_roles)) do
+      on release_roles(fetch(:assets_roles)) do
         within release_path do
-          source = release_path.join('assets_manifest_backup')
-          target = capture(:ls, release_path.join('public', fetch(:assets_prefix),
-                                                  'manifest*')).strip
+          target = detect_manifest_path
+          source = release_path.join('assets_manifest_backup', File.basename(target))
           if test "[[ -f #{source} && -f #{target} ]]"
             execute :cp, source, target
           else
@@ -89,6 +91,18 @@ namespace :deploy do
       end
     end
 
+    def detect_manifest_path
+      %w(
+        .sprockets-manifest*
+        manifest*.*
+      ).each do |pattern|
+        candidate = release_path.join('public', fetch(:assets_prefix), pattern)
+        return capture(:ls, candidate).strip if test(:ls, candidate)
+      end
+      msg = 'Rails assets manifest file not found.'
+      warn msg
+      fail Capistrano::FileNotFound, msg
+    end
   end
 end
 

data/lib/capistrano/tasks/migrations.rake

@@ -10,7 +10,7 @@ namespace :deploy do
       if conditionally_migrate && test("diff -q #{release_path}/db/migrate #{current_path}/db/migrate")
         info '[deploy:migrate] Skip `deploy:migrate` (nothing changed in db/migrate)'
       else
-        info '[deploy:migrate] Run `rake db:migrate`' if conditionally_migrate
+        info '[deploy:migrate] Run `rake db:migrate`'
         within release_path do
           with rails_env: fetch(:rails_env) do
             execute :rake, "db:migrate"

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Tom Clements
 - Lee Hambley
+- Kir Shatrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2015-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -43,6 +44,7 @@ description: Rails specific Capistrano tasks
 email:
 - seenmyfate@gmail.com
 - lee.hambley@gmail.com
+- shatrov@me.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -80,9 +82,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails specific Capistrano tasks
 test_files: []
-has_rdoc: