capistrano-rails 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7065170b7a368f7095b8c03cb8c1cf79351a1cc6
-  data.tar.gz: e15b821f871fd65299ba87df3b46daa099efcf5f
+  metadata.gz: 45a9dad70b2ce330f6fef57d0d1bfb633a50e57b
+  data.tar.gz: 9a7e56761759025fefda6d1ae96d388ac873fa77
 SHA512:
-  metadata.gz: 97634bcd7e7a043c3bc1f0bcc0f8ea21a0704a904cd02501eabd88cc0e602f375b3d522330b97375e20c00408b353141018e6e0fea543448bfc47f53123b99e9
-  data.tar.gz: dd80fa91b3b846cb78a13484e29cce1a7a86b412a0f07dec191becf8fd80c62fc7c035c96f01b670b1552ee9c7b256f667f5d99c6082b1266fe068697a56cb25
+  metadata.gz: 1355a3af7d085d8dd7add88db62a81958cea0fa368e4f26e61a2d5418ae0a73a8306317b9ce75383b9c3e845f5fa14e450c5dd77e3665d0f1e54623215b38615
+  data.tar.gz: 21b5cb0fdc2b1fa18714f5aae1b4e6822890f8fe808472943dca07fed304dd2c72af9ae3f551a62a3c86e7f2a8005c69e4c41e79ae84414d15026f11dab92eed

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.1.4 (Oct 10 2015)
+
+* Fixing bug with normalize_assets typo #138
+* Cleanup assets after:updated (#136)
+* Fixed linked_dirs containing default value of assets_prefix (#125)
+
 # 1.1.3 (Apr 18 2015)
 
 * Fixed no_release behaviour (https://github.com/capistrano/rails/pull/95)

data/README.md

@@ -5,53 +5,69 @@ Rails specific tasks for Capistrano v3:
   - `cap deploy:migrate`
   - `cap deploy:compile_assets`
 
-Some rails specific options.
+## Installation
+
+Add this line to your application's Gemfile:
 
 ```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. 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
+gem 'capistrano', '~> 3.1'
+gem 'capistrano-rails', '~> 1.1'
 ```
 
-If you need to touch `public/images`, `public/javascripts` and `public/stylesheets` on each deploy:
+## Usage
+
+Require everything (`bundler`, `rails/assets` and `rails/migrations`):
 
 ```ruby
-set :normalize_asset_timestamps, %{public/images public/javascripts public/stylesheets}
+# Capfile
+require 'capistrano/rails'
 ```
 
-## Installation
+Or require just what you need manually:
 
-Add this line to your application's Gemfile:
+```ruby
+# Capfile
+require 'capistrano/bundler' # Rails needs Bundler, right?
+require 'capistrano/rails/assets'
+require 'capistrano/rails/migrations'
+```
 
-    gem 'capistrano',  '~> 3.1'
-    gem 'capistrano-rails', '~> 1.1'
+Please note that any `require`s should be placed in `Capfile`, not in `config/deploy.rb`.
 
-## Usage
+You can tweak some Rails-specific options in `config/deploy.rb`:
 
-Require everything (bundler, rails/assets and rails/migrations)
+```ruby
+# If the environment differs from the stage name
+set :rails_env, 'staging'
 
-    # Capfile
-    require 'capistrano/rails'
+# Defaults to 'db'
+set :migration_role, 'migrator'
 
-Or require just what you need manually:
+# Defaults to false
+# Skip migration if files in db/migrate were not modified
+set :conditionally_migrate, true
 
-    # Capfile
-    require 'capistrano/bundler' # Rails needs Bundler, right?
-    require 'capistrano/rails/assets'
-    require 'capistrano/rails/migrations'
+# Defaults to [:web]
+set :assets_roles, [:web, :app]
 
-Please note that any `require` should be placed in `Capfile`, not `config/deploy.rb`.
+# Defaults to 'assets'
+# This should match config.assets.prefix in your rails config/application.rb
+set :assets_prefix, 'prepackaged-assets'
+
+# If you need to touch public/images, public/javascripts, and public/stylesheets on each deploy
+set :normalize_asset_timestamps, %{public/images public/javascripts public/stylesheets}
+```
 
 ### 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')
+```ruby
+# 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
 

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.3'
+  gem.version       = '1.1.4'
   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}

data/lib/capistrano/tasks/assets.rake

@@ -24,7 +24,6 @@ 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 => [:set_rails_env] do
     on release_roles(fetch(:assets_roles)) do
@@ -46,8 +45,7 @@ namespace :deploy do
   end
 
   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:cleanup_assets'
   after 'deploy:updated', 'deploy:normalize_assets'
   after 'deploy:reverted', 'deploy:rollback_assets'
 
@@ -106,10 +104,19 @@ namespace :deploy do
   end
 end
 
+# we can't set linked_dirs in load:defaults,
+# as assets_prefix will always have a default value
+namespace :deploy do
+  task :set_linked_dirs do
+    set :linked_dirs, fetch(:linked_dirs, []).push("public/#{fetch(:assets_prefix)}")
+  end
+end
+
+after 'deploy:set_rails_env', 'deploy:set_linked_dirs'
+
 namespace :load do
   task :defaults do
     set :assets_roles, fetch(:assets_roles, [:web])
     set :assets_prefix, fetch(: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.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Tom Clements
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails specific Capistrano tasks