glebtv-capistrano-unicorn 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5990d278d6902c50e120a1504d5f4341e227fab5
-  data.tar.gz: 4b87749b85b2773c0725548be20fd1b50cd4172e
+  metadata.gz: 1b3e269b06dadaa79a330e1a68de83b93e18b4b9
+  data.tar.gz: e875511de350029514c58e2c8ec618b1a8488fdd
 SHA512:
-  metadata.gz: ca2f8bbfd08c74e565ee4e1298a4b8aa7202bda05d7ca8583580fec331bd1a857244396eb29a88a21f25bfd8645239a9b96e83adbaa0f63342b40dfd19148601
-  data.tar.gz: 9a019e164ab965895a0d025e6d90ca7c2d43932a63fcccafffd7aeb8aa9dd10c4c261750b842f39589f5b6bdb74cd65847fa3ccff0f81160d79a62ff629c4e57
+  metadata.gz: 28fa51f25b0a60172019f9108f4d9e6b08c462fa792c525341c13b040fa278e33d4214cde391b2be2dc3a5c02c14f8f77d3de0ead8db2d60fcc4d9a6fcc4686f
+  data.tar.gz: aaddf4ce3444d94714c68a8f25e73208e282f6229f9427ab4063d7658aeac63ef5df1a62251ca484cde8a2f70c3c8207eeaf1cccd48d86174223666685b78eb3

data/Gemfile

@@ -2,8 +2,3 @@ source 'https://rubygems.org'
 
 gemspec
 
-group :test do
-  gem 'rspec'
-  gem 'capistrano-spec'
-  gem 'pry-debugger'
-end

data/LICENSE

@@ -1,4 +1,5 @@
 Copyright (c) 2011-2013 Dan Sosedoff.
+Copyright (c) 2014-2015 GlebTv
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 
@@ -15,4 +16,4 @@ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
 PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -3,12 +3,6 @@
 Capistrano 3.x plugin that integrates Unicorn tasks into capistrano deployment script.
 Taken from https://github.com/sosedoff/capistrano-unicorn and adapted to work with Capistrano 3.x.
 
-**Note: this code is not well tested, if anything fails, please report it. Use at your own risk.**
-
-**Developers:** Please consider contributing your forked changes, or opening an
-issue if there is no existing relevant one. There are a lot of forks--we'd love
-to reabsorb some of the issues/solutions the community has encountered.
-
 [![Gem Version](https://badge.fury.io/rb/glebtv-capistrano-unicorn.svg)](http://badge.fury.io/rb/glebtv-capistrano-unicorn)
 
 ## Usage
@@ -25,7 +19,7 @@ group :development do
 end
 ```
 
-And load it into your deployment script `config/deploy.rb`:
+Add it to `Capfile`:
 
 ```ruby
 require 'capistrano/unicorn'
@@ -42,7 +36,12 @@ after 'deploy:restart', 'unicorn:duplicate' # before_fork hook implemented (zero
 Create a new configuration file `config/unicorn.rb` or `config/unicorn/STAGE.rb`, 
 where stage is your deployment environment.
 
-Example config - [examples/rails3.rb](https://github.com/sosedoff/capistrano-unicorn/blob/master/examples/rails3.rb). 
+## Example config 
+
+Includes zero-downtime deployments
+
+[examples/rails3.rb](https://github.com/glebtv/capistrano-unicorn/blob/master/examples/rails3.rb). 
+
 Please refer to Unicorn documentation for more examples and configuration options.
 
 ### Deploy
@@ -50,15 +49,15 @@ Please refer to Unicorn documentation for more examples and configuration option
 First, make sure you're running the latest release:
 
 ```
-cap deploy
+cap production deploy
 ```
 
 Then you can test each individual task:
 
 ```
-cap unicorn:start
-cap unicorn:stop
-cap unicorn:reload
+cap production unicorn:start
+cap production unicorn:stop
+cap production unicorn:reload
 ```
 
 ## Configuration
@@ -106,73 +105,16 @@ are set correctly.
 To get a list of all capistrano tasks, run `cap -T`:
 
 ```
-cap unicorn:add_worker                # Add a new worker
-cap unicorn:remove_worker             # Remove amount of workers
-cap unicorn:reload                    # Reload Unicorn
-cap unicorn:restart                   # Restart Unicorn
-cap unicorn:show_vars                 # Debug Unicorn variables
-cap unicorn:shutdown                  # Immediately shutdown Unicorn
-cap unicorn:start                     # Start Unicorn master process
-cap unicorn:stop                      # Stop Unicorn
-```
-
-## Tests
-
-To execute test suite run:
-
-```
-bundle exec rake test
-```
-
-### Multistage
-
-The issue here is that capistrano loads default configuration and then
-executes your staging task and overrides previously defined
-variables. The default environment before executing your stage task is
-set to `:production`, so it will use a wrong environment unless you
-take steps to ensure that `:rails_env` and `:unicorn_env` are
-set correctly.
-
-Let's say you have a scenario involving two deployment stages: staging
-and production.  You’ll need to add `config/deploy/staging.rb` and
-`config/deploy/production.rb` files.  However, it makes sense to
-adhere to DRY and avoid duplicating lines between the two files.  So
-it would be nicer to keep common settings in `config/deploy.rb`, and
-only put stuff in each staging definition file which is really
-specific to that staging environment.  Fortunately this can be done
-using the [lazy evaluation form of `set`](https://github.com/capistrano/capistrano/wiki/2.x-DSL-Configuration-Variables-Set).
-
-So `config/deploy.rb` file would contain something like:
-
-```ruby
-set :stages, %w(production staging)
-set :default_stage, "staging"
-require 'capistrano/ext/multistage'
-
-role(:web) { domain }
-role(:app) { domain }
-role(:db, :primary => true) { domain }
-
-set(:deploy_to)    { "/home/#{user}/#{application}/#{fetch :rails_env}" }
-set(:current_path) { File.join(deploy_to, current_dir) }
-```
-
-Then `config/deploy/production.rb` would contain something like:
-
-```ruby
-set :domain,      "app.mydomain.com"
-set :rails_env,   "production"
-```
-
-and `config/deploy/staging.rb` would only need to contain something like:
-
-```ruby
-set :domain,      "app.staging.mydomain.com"
-set :rails_env,   "staging"
+cap production unicorn:add_worker                # Add a new worker
+cap production unicorn:remove_worker             # Remove amount of workers
+cap production unicorn:reload                    # Reload Unicorn
+cap production unicorn:restart                   # Restart Unicorn
+cap production unicorn:show_vars                 # Debug Unicorn variables
+cap production unicorn:shutdown                  # Immediately shutdown Unicorn
+cap production unicorn:start                     # Start Unicorn master process
+cap production unicorn:stop                      # Stop Unicorn
 ```
 
-Nice and clean!
-
 ## License
 
 See LICENSE file for details.

data/Rakefile

@@ -1,10 +1,3 @@
 require "bundler"
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
 
-
-RSpec::Core::RakeTask.new(:test) do |spec|
-  spec.pattern = "spec/**/*_spec.rb"
-end
-
-task :default => :test

data/examples/rails3.rb

@@ -1,45 +1,67 @@
-# ------------------------------------------------------------------------------
-# Sample rails 3 config
-# ------------------------------------------------------------------------------
+rails_env = ENV['RAILS_ENV'] || 'production'
 
-# Set your full path to application.
-app_path = "/path/to/app"
+deploy_to = "/data/rt/app"
+rails_root = "#{deploy_to}/current"
 
-# Set unicorn options
-worker_processes 1
-preload_app true
-timeout 180
-listen "127.0.0.1:9000"
+pid_dir = "#{deploy_to}/shared/tmp/pids"
+FileUtils.mkdir_p(pid_dir, mode: 0777) unless File.directory?(pid_dir)
 
-# Spawn unicorn master worker for user apps (group: apps)
-user 'apps', 'apps' 
+pid_file = "#{pid_dir}/unicorn.pid"
+#socket_file= "#{deploy_to}/shared/sockets/unicorn.sock"
+log_file = "#{deploy_to}/shared/log/unicorn.log"
+err_log_file = "#{deploy_to}/shared/log/unicorn.error.log"
 
-# Fill path to your app
-working_directory app_path
+old_pid_file = pid_file + '.oldbin'
 
-# Should be 'production' by default, otherwise use other env 
-rails_env = ENV['RAILS_ENV'] || 'production'
+worker_processes 2
+working_directory rails_root
+
+timeout 300
 
-# Log everything to one file
-stderr_path "log/unicorn.log"
-stdout_path "log/unicorn.log"
+# Specify path to socket unicorn listens to,
+# we will use this in our nginx.conf later
 
-# Set master PID location
-pid "#{app_path}/tmp/pids/unicorn.pid"
+listen "127.0.0.1:4000"
+
+pid pid_file
+
+# Set log file paths
+stderr_path err_log_file
+stdout_path log_file
+
+# http://tech.tulentsev.com/2012/03/deploying-with-sinatra-capistrano-unicorn/
+# NOTE: http://unicorn.bogomips.org/SIGNALS.html
+preload_app true
+
+# make sure that Bundler finds the Gemfile
+before_exec do |server|
+  ENV['BUNDLE_GEMFILE'] = File.join( rails_root, 'Gemfile' )
+end
 
 before_fork do |server, worker|
-  ActiveRecord::Base.connection.disconnect!
+  # при использовании preload_app = true здесь должно быть закрытие всех открытых сокетов
 
-  old_pid = "#{server.config[:pid]}.oldbin"
-  if File.exists?(old_pid) && server.pid != old_pid
+  # uncomment for AR
+  # ActiveRecord::Base.connection.disconnect
+  # Mongoid reconnects itself
+  # http://two.mongoid.org/docs/upgrading.html
+
+  # http://stackoverflow.com/a/9498372/2041969
+  if File.exists?( old_pid_file )
     begin
-      Process.kill("QUIT", File.read(old_pid).to_i)
+      Process.kill( "QUIT", File.read( old_pid_file ).to_i )
     rescue Errno::ENOENT, Errno::ESRCH
-      # someone else did our job for us
+      puts "Old master alerady dead"
     end
   end
 end
 
 after_fork do |server, worker|
-  ActiveRecord::Base.establish_connection
-end
+  # uncomment for AR
+  # ActiveRecord::Base.establish_connection
+  
+  # child process pids for monitoring if you need them
+  child_pid_file = server.config[:pid].sub( '.pid', ".#{worker.nr}.pid" )
+  system( "echo #{Process.pid} > #{child_pid_file}" )
+end
+

data/glebtv-capistrano-unicorn.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "unicorn"
-  spec.add_runtime_dependency     "capistrano", "~> 3.0"
+  spec.add_runtime_dependency     "capistrano", "~> 3.4"
 end

data/lib/capistrano/tasks/{unicorn.cap → unicorn.rake}

@@ -85,28 +85,28 @@ namespace :unicorn do
 
   desc 'Start Unicorn master process'
   task :start do
-    on roles unicorn_roles, reject: lambda { |h| h.properties.no_release } do
+    on release_roles(unicorn_roles) do
       execute start_unicorn
     end
   end
 
   desc 'Stop Unicorn'
   task :stop do
-    on roles unicorn_roles, reject: lambda { |h| h.properties.no_release } do
+    on release_roles(unicorn_roles) do
       execute kill_unicorn('QUIT')
     end
   end
 
   desc 'Immediately shutdown Unicorn'
   task :shutdown do
-    on roles unicorn_roles, reject: lambda { |h| h.properties.no_release } do
+    on release_roles(unicorn_roles) do
       execute kill_unicorn('TERM')
     end
   end
 
   desc 'Restart Unicorn'
   task :restart do
-    on roles unicorn_roles, reject: lambda { |h| h.properties.no_release } do
+    on release_roles(unicorn_roles) do
       duplicate_unicorn
       execute :sleep, fetch(:unicorn_restart_sleep_time)
 
@@ -118,14 +118,14 @@ namespace :unicorn do
 
   desc 'Duplicate Unicorn'
   task :duplicate do
-    on roles unicorn_roles, reject: lambda { |h| h.properties.no_release } do
+    on release_roles(unicorn_roles) do
       duplicate_unicorn
     end
   end
 
   desc 'Reload Unicorn'
   task :reload do
-    on roles unicorn_roles, reject: lambda { |h| h.properties.no_release } do
+    on release_roles(unicorn_roles) do
       if unicorn_is_running?
         unicorn_send_signal('HUP')
       else

data/lib/capistrano/unicorn.rb

@@ -1 +1 @@
-load File.expand_path(File.join('..', 'tasks', 'unicorn.cap'), __FILE__)
+load File.expand_path(File.join('..', 'tasks', 'unicorn.rake'), __FILE__)

data/lib/capistrano/unicorn/utility.rb

@@ -139,9 +139,7 @@ module CapistranoUnicorn
     end
 
     def unicorn_roles
-      # TODO proc necessary here?
       Proc.new{ fetch(:unicorn_roles, :app) }.call
-      #defer{ fetch(:unicorn_roles, :app) }
     end
   end
 end

data/lib/capistrano/unicorn/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-capistrano-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - glebtv, Sebastian Gassner, Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.4'
 description: Capistrano 3.x plugin that integrates Unicorn server tasks.
 email: glebtv@gmail.com
 executables: []
@@ -65,18 +65,16 @@ files:
 - ".travis.yml"
 - Gemfile
 - LICENSE
-- NEWS.md
 - README.md
 - Rakefile
 - examples/rails3.rb
 - glebtv-capistrano-unicorn.gemspec
 - lib/capistrano-unicorn.rb
-- lib/capistrano/tasks/unicorn.cap
+- lib/capistrano/tasks/unicorn.rake
 - lib/capistrano/unicorn.rb
 - lib/capistrano/unicorn/utility.rb
 - lib/capistrano/unicorn/version.rb
 - lib/glebtv-capistrano-unicorn.rb
-- lib/unicorn.rb
 homepage: https://github.com/glebtv/capistrano-unicorn
 licenses:
 - MIT
@@ -97,7 +95,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: Unicorn integration for Capistrano 3.x

data/NEWS.md

@@ -1,27 +0,0 @@
-# Capistrano Unicorn NEWS
-
-## 0.2.0
-
-Significant changes since 0.1.10 are as follows.  Backwards-incompatible changes are **in bold**.
-
-*   Ensured `RAILS_ENV` is set correctly.
-*   Embedded multistage docs directly within the [README](README.md) (the wiki page was version-specific and misleading).
-*   Significantly tidied up the usage and documentation of configuration variables:
-    *   **In most cases, it should now be sufficient to simply set `rails_env` correctly,
-        and other variables should assume the correct value by default.**
-    *   **Make `unicorn_env` default to `rails_env` or `'production'`.**
-    *   **Rename `app_env` to `unicorn_rack_env` and fix default value.**
-    *   Add `unicorn_options` variable which allows passing of arbitrary options to unicorn.
-    *   Added `app_subdir` to support app running in a subdirectory.
-    *   Updated documentation in [README](README.md) to fix inaccuracies and ambiguities.
-    *   `unicorn_pid` defaults to attempting to auto-detect from unicorn config file.
-        This avoids having to keep two paths in sync.
-        https://github.com/sosedoff/capistrano-unicorn/issues/7
-    *   Also added the `unicorn:show_vars` task to make it easier to debug
-        config variable values client-side.
-*   Defer calculation of `unicorn-roles`.
-
-It was noticed that there are a
-[huge number of unmerged forks on github](https://github.com/sosedoff/capistrano-unicorn/issues/45),
-so we also updated the [README](README.md) asking the community to
-contribute back any useful changes they make.