capistrano-rails 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6951518ecbf65c0683c8177586638ae12764cdc9
-  data.tar.gz: aab574b616b287b20450adbb46e82cd3b75f044d
+  metadata.gz: 161fbac08b98832aad793818c97602d8877861e5
+  data.tar.gz: 6d8f505851a89ed09a91c02fde975f7e4b48c096
 SHA512:
-  metadata.gz: 94abda59736ef34941085ef2a353c96f245a7b6fec21f084c0f558d51f3539f9a462ef327feeb2848e9dd96a5d6ae2a2d0e77a9a373f8568677b753001fb2989
-  data.tar.gz: ffa784e092b0e8f416e8a13b84e9db27ca959b778a2e8b9e7258fa07b4ffbeb652989d00b8f0bab63cc4f95f92a33e59ec6e16de274169ea69548ec900dd6b1f
+  metadata.gz: 329f7f782db484f5b84c767b2b1ddad6c9f282a28642ec0a2d68c450ce7bff646756ca42317b9d0a269553c993b39117fbca6554d051b64dba8f120c2ccef4a8
+  data.tar.gz: 007dd24abc173d288d37588518358d9332ab3740204a33ac16580c7a037b572685b80353e30bcee4639d5ad39d641db0206621a239cf518db0ae5f2402f3a517

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.1.1
+
+* New `asset_roles` options: https://github.com/capistrano/rails/pull/30
+* normalized task spelling: 'deploy:normalise_assets' is now 'deploy:normalize_assets'
+* depend on capistrano 3.1 to support multiple role arguments
+
 # 1.1.0
 
 * set rails_env even if capistrano-rails was required partly

data/README.md

@@ -8,8 +8,10 @@ Rails specific tasks for Capistrano v3:
 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 :rails_env, 'staging'                  # If the environment differs from the stage name
+set :migration_role, 'migrator'            # Defaults to 'db'
+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
 ```
 
 If you need to touch `public/images`, `public/javascripts` and `public/stylesheets` on each deploy:
@@ -22,8 +24,8 @@ set :normalize_asset_timestamps, %{public/images public/javascripts public/style
 
 Add this line to your application's Gemfile:
 
-    gem 'capistrano',  '~> 3.0.0'
-    gem 'capistrano-rails'
+    gem 'capistrano',  '~> 3.1'
+    gem 'capistrano-rails', '~> 1.1'
 
 ## Usage
 
@@ -38,6 +40,8 @@ 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`.
 
 ## Contributing
 

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       = '1.1.0'
+  gem.version       = '1.1.1'
   gem.authors       = ["Tom Clements", "Lee Hambley"]
   gem.email         = ["seenmyfate@gmail.com", "lee.hambley@gmail.com"]
   gem.description   = %q{Rails specific Capistrano tasks}
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'capistrano', '>= 3.0.0'
-  gem.add_dependency 'capistrano-bundler', '>= 1.0.0'
+  gem.add_dependency 'capistrano', '~> 3.1'
+  gem.add_dependency 'capistrano-bundler', '~> 1.1'
 
 end

data/lib/capistrano/tasks/assets.rake

@@ -6,13 +6,9 @@ module Capistrano
 end
 
 namespace :deploy do
-  before :starting, :set_shared_assets do
-    set :linked_dirs, (fetch(:linked_dirs) || []).push('public/assets')
-  end
-
-  desc 'Normalise asset timestamps'
-  task :normalise_assets => [:set_rails_env] do
-    on roles :web do
+  desc 'Normalize asset timestamps'
+  task :normalize_assets => [:set_rails_env] do
+    on roles(fetch(:assets_roles)) do
       assets = fetch(:normalize_asset_timestamps)
       if assets
         within release_path do
@@ -31,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 :web do
+    on roles(fetch(:assets_roles)) do
       within release_path do
         with rails_env: fetch(:rails_env) do
           execute :rake, "assets:clean"
@@ -52,12 +48,12 @@ namespace :deploy do
   after 'deploy:updated', 'deploy:compile_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:updated', 'deploy:normalize_assets'
   after 'deploy:reverted', 'deploy:rollback_assets'
 
   namespace :assets do
     task :precompile do
-      on roles :web do
+      on roles(fetch(:assets_roles)) do
         within release_path do
           with rails_env: fetch(:rails_env) do
             execute :rake, "assets:precompile"
@@ -67,20 +63,20 @@ namespace :deploy do
     end
 
     task :backup_manifest do
-      on roles :web do
+      on roles(fetch(:assets_roles)) do
         within release_path do
           execute :cp,
-            release_path.join('public', 'assets', 'manifest*'),
+            release_path.join('public', fetch(:assets_prefix), 'manifest*'),
             release_path.join('assets_manifest_backup')
         end
       end
     end
 
     task :restore_manifest do
-      on roles :web do
+      on roles(fetch(:assets_roles)) do
         within release_path do
           source = release_path.join('assets_manifest_backup')
-          target = capture(:ls, release_path.join('public', 'assets',
+          target = capture(:ls, release_path.join('public', fetch(:assets_prefix),
                                                   'manifest*')).strip
           if test "[[ -f #{source} && -f #{target} ]]"
             execute :cp, source, target
@@ -94,5 +90,12 @@ namespace :deploy do
     end
 
   end
+end
 
+namespace :load do
+  task :defaults do
+    set :assets_roles, [:web]
+    set :assets_prefix, 'assets'
+    set :linked_dirs, fetch(:linked_dirs, []).push("public/#{fetch(:assets_prefix)}")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Tom Clements
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: capistrano-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
 description: Rails specific Capistrano tasks
 email:
 - seenmyfate@gmail.com
@@ -47,7 +47,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -70,19 +70,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Rails specific Capistrano tasks
 test_files: []
-has_rdoc: