glebtv-capistrano-unicorn 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b3e269b06dadaa79a330e1a68de83b93e18b4b9
-  data.tar.gz: e875511de350029514c58e2c8ec618b1a8488fdd
+  metadata.gz: f2635da2f2f63b001837a1179917779478682ecc
+  data.tar.gz: 55df11ef99a56d211c3f0acd8239851c33dc5734
 SHA512:
-  metadata.gz: 28fa51f25b0a60172019f9108f4d9e6b08c462fa792c525341c13b040fa278e33d4214cde391b2be2dc3a5c02c14f8f77d3de0ead8db2d60fcc4d9a6fcc4686f
-  data.tar.gz: aaddf4ce3444d94714c68a8f25e73208e282f6229f9427ab4063d7658aeac63ef5df1a62251ca484cde8a2f70c3c8207eeaf1cccd48d86174223666685b78eb3
+  metadata.gz: c0aec1c6e01337285e3babac8badf010920c21079465393b0d7eacad04a5cc66a284e85b7d4a9fef0139216829f3067fd7fd4df420cc9c4410d5b95a1cbe3c92
+  data.tar.gz: d6ba09de4180bd9a41bfcb1db0b12ed70c9364aeea01f254b267a73b09f32ccfe9581d54e24b28f8e097eb66eddaab32161b1919995e0bf16c1426ce3402052a

data/README.md

@@ -7,11 +7,9 @@ Taken from https://github.com/sosedoff/capistrano-unicorn and adapted to work wi
 
 ## Usage
 
-If you are upgrading from a previous version, please see the [NEWS file](NEWS.md).
-
 ### Setup
 
-Add the library to your `Gemfile`:
+**Add the library to your `Gemfile`:**
 
 ```ruby
 group :development do
@@ -19,18 +17,30 @@ group :development do
 end
 ```
 
-Add it to `Capfile`:
+**Add it to `Capfile`:**
 
 ```ruby
 require 'capistrano/unicorn'
 ```
 
-Add unicorn restart task hook:
+**Add unicorn restart task hook:**
+
+If your app IS NOT preloaded (preload_app false, default):
+
+```ruby
+after 'deploy:publishing', 'unicorn:reload'
+```
+
+If your app is preloaded (preload_app true): 
 
 ```ruby
-after 'deploy:restart', 'unicorn:reload'    # app IS NOT preloaded
-after 'deploy:restart', 'unicorn:restart'   # app preloaded
-after 'deploy:restart', 'unicorn:duplicate' # before_fork hook implemented (zero downtime deployments)
+after 'deploy:publishing', 'unicorn:restart'
+```
+
+If you have before_fork unicorn hook for zero downtime deployments installed (preload_app true + before_hook), best option:
+
+```ruby
+after 'deploy:publishing', 'unicorn:duplicate'
 ```
 
 Create a new configuration file `config/unicorn.rb` or `config/unicorn/STAGE.rb`, 
@@ -42,6 +52,9 @@ Includes zero-downtime deployments
 
 [examples/rails3.rb](https://github.com/glebtv/capistrano-unicorn/blob/master/examples/rails3.rb). 
 
+Please READ all comments in the file if you are having problems.
+If you use AR you need to uncomment two lines in the file.
+
 Please refer to Unicorn documentation for more examples and configuration options.
 
 ### Deploy

data/examples/rails3.rb

@@ -39,8 +39,6 @@ before_exec do |server|
 end
 
 before_fork do |server, worker|
-  # при использовании preload_app = true здесь должно быть закрытие всех открытых сокетов
-
   # uncomment for AR
   # ActiveRecord::Base.connection.disconnect
   # Mongoid reconnects itself

data/lib/capistrano/tasks/unicorn.rake

@@ -6,7 +6,6 @@ include CapistranoUnicorn::Utility
 # See https://github.com/capistrano/capistrano/pull/605
 namespace :load do
   task :defaults do
-
     # Environments
     set :unicorn_env     , Proc.new{ fetch(:rails_env, 'production') }
     # Following recommendations from http://unicorn.bogomips.org/unicorn_1.html

data/lib/capistrano/unicorn/utility.rb

@@ -124,8 +124,14 @@ module CapistranoUnicorn
       puts 'Starting unicorn...'
 
       within fetch(:app_path) do
-        with rails_env: fetch(:rails_env), bundle_gemfile: fetch(:bundle_gemfile) do
-          execute :bundle, 'exec', fetch(:unicorn_bin), '-c', unicorn_config_file_path, '-E', fetch(:unicorn_rack_env), '-D', fetch(:unicorn_options)
+        if fetch(:bundle_gemfile).nil?
+          with rails_env: fetch(:rails_env) do
+            execute :bundle, 'exec', fetch(:unicorn_bin), '-c', unicorn_config_file_path, '-E', fetch(:unicorn_rack_env), '-D', fetch(:unicorn_options)
+          end
+        else
+          with rails_env: fetch(:rails_env), bundle_gemfile: fetch(:bundle_gemfile) do
+            execute :bundle, 'exec', fetch(:unicorn_bin), '-c', unicorn_config_file_path, '-E', fetch(:unicorn_rack_env), '-D', fetch(:unicorn_options)
+          end
         end
       end
     end

data/lib/capistrano/unicorn/version.rb

@@ -1,5 +1,5 @@
 module CapistranoUnicorn
   unless defined?(::CapistranoUnicorn::VERSION)
-    VERSION = "0.4.0".freeze
+    VERSION = "0.4.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-capistrano-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - glebtv, Sebastian Gassner, Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake