sepastian-capistrano3-unicorn 0.3.0 → 0.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fbaccaa6fb6582beeed06e5e627e4b058621ba64
+  data.tar.gz: c20b3a340555785bfad1ed97d1c166dd3c2f38d1
+SHA512:
+  metadata.gz: f3acb9a1d3a9d3040530f951e6c7a35e1d3ba29bf5e7386c152fc16f04d00fba4d2f6707a9bf3c8532d1b284bae782ea983f35177c55b85f8c03c7dae8cf083a
+  data.tar.gz: d080c5ef285ac1260b7aaeb56d8abdefdee610cc017d4e289794bcaba1e51d23547b69cacf6dacaede007d185219f3487f88c2b1ce1716790209196eae1f6cb1

data/README.md

@@ -1,14 +1,15 @@
 # Capistrano Unicorn
 
-Capistrano plugin that integrates Unicorn tasks into capistrano deployment script.
+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.
 
-[![Build Status](https://travis-ci.org/sosedoff/capistrano-unicorn.png?branch=master)](https://travis-ci.org/sosedoff/capistrano-unicorn)
-[![Gem Version](https://badge.fury.io/rb/capistrano-unicorn.png)](http://badge.fury.io/rb/capistrano-unicorn)
-[![Code Climate](https://codeclimate.com/github/sosedoff/capistrano-unicorn.png)](https://codeclimate.com/github/sosedoff/capistrano-unicorn)
+[![Gem Version](https://badge.fury.io/rb/sepastian-capistrano3-unicorn.png)](http://badge.fury.io/rb/sepastian-capistrano3-unicorn)
 
 ## Usage
 
@@ -20,14 +21,14 @@ Add the library to your `Gemfile`:
 
 ```ruby
 group :development do
-  gem 'capistrano-unicorn', :require => false
+  gem 'sepastian-capistrano3-unicorn', :require => false
 end
 ```
 
 And load it into your deployment script `config/deploy.rb`:
 
 ```ruby
-require 'capistrano-unicorn'
+require 'capistrano/unicorn'
 ```
 
 Add unicorn restart task hook:

data/lib/capistrano/tasks/unicorn.cap

@@ -31,7 +31,6 @@ namespace :load do
     # If you find the following confusing, try running 'cap unicorn:show_vars' -
     # it might help :-)
     set :app_path                      , Proc.new{ File.join(current_path, fetch(:app_subdir)) }
-    set :bundle_gemfile                , Proc.new{ File.join(fetch(:app_path), 'Gemfile') }
     set :unicorn_config_path           , Proc.new{ File.join(fetch(:app_path), fetch(:unicorn_config_rel_path)) }
     set :unicorn_config_file_path      , Proc.new{ File.join(fetch(:app_path), fetch(:unicorn_config_rel_file_path)) }
     set :unicorn_config_stage_file_path, Proc.new{ File.join(fetch(:app_path), fetch(:unicorn_config_stage_rel_file_path)) }
@@ -77,7 +76,6 @@ namespace :unicorn do
         # Absolute paths
         app_path                  #{fetch :app_path}
         unicorn_pid               #{fetch :unicorn_pid}
-        bundle_gemfile            #{fetch :bundle_gemfile}
         unicorn_config_path       #{fetch :unicorn_config_path}
         unicorn_config_file_path  #{fetch :unicorn_config_file_path}
         unicorn_config_stage_file_path
@@ -89,6 +87,7 @@ namespace :unicorn do
   desc 'Start Unicorn master process'
   task :start do
     on roles unicorn_roles, :except => {:no_release => true} do
+      
       execute start_unicorn
     end
   end
@@ -125,8 +124,8 @@ namespace :unicorn do
   
   desc 'Reload Unicorn'
   task :reload do
-    on roles => unicorn_roles, :except => {:no_release => true} do
-      execute "if #{unicorn_is_running?}; then #{unicorn_send_signal('HUP')}; else #{start_unicorn}; fi;"
+    on roles unicorn_roles, :except => {:no_release => true} do
+      execute "if #{unicorn_is_running?}; then #{unicorn_send_signal('HUP')}; else #{start_unicorn} fi;"
       # run <<-END
       #   if #{unicorn_is_running?}; then
       #     echo "Reloading Unicorn...";
@@ -140,7 +139,7 @@ namespace :unicorn do
 
   desc 'Add a new worker'
   task :add_worker do
-    on roles => unicorn_roles, :except => {:no_release => true} do
+    on roles unicorn_roles, :except => {:no_release => true} do
       execute "if #{unicorn_is_running?}; then #{unicorn_send_signal('TTIN')}; fi;"
       # run <<-END
       #   if #{unicorn_is_running?}; then
@@ -155,7 +154,7 @@ namespace :unicorn do
 
   desc 'Remove amount of workers'
   task :remove_worker do
-    on roles => unicorn_roles, :except => {:no_release => true} do
+    on roles unicorn_roles, :except => {:no_release => true} do
       execute "if #{unicorn_is_running?}; then #{unicorn_send_signal('TTOU')}; fi;"
       # run <<-END
       #   if #{unicorn_is_running?}; then

data/lib/capistrano/unicorn/utility.rb

@@ -55,7 +55,7 @@ module CapistranoUnicorn
     # Check if a remote process exists using its pid file
     #
     def remote_process_exists?(pid_file)
-      "[ -e #{pid_file} ] && #{try_unicorn_user} kill -0 `cat #{pid_file}` > /dev/null 2>&1"
+      "[ -e #{pid_file} ] && #{unicorn_send_signal(0, get_unicorn_pid(pid_file))} > /dev/null 2>&1"
     end
 
     # Stale Unicorn process pid file
@@ -91,7 +91,8 @@ module CapistranoUnicorn
     # Send a signal to a unicorn master processes
     #
     def unicorn_send_signal(signal, pid=get_unicorn_pid)
-      "#{try_unicorn_user} kill -s #{signal} #{pid}"
+      sig_prefix = Integer === signal ? '-' : '-s '
+      "#{try_unicorn_user} kill #{sig_prefix}#{signal} #{pid}"
     end
 
     # Run a command as the :unicorn_user user if :unicorn_user is a string.

data/lib/capistrano/unicorn/version.rb

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

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: sepastian-capistrano3-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors:
 - Sebastian Gassner, Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -87,27 +80,26 @@ files:
 homepage: https://github.com/sepastian/capistrano-unicorn
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Unicorn integration for Capistrano 3.x
 test_files: []
 has_rdoc: