capistrano-unicorn 0.1.1 → 0.1.2

data/examples/rails3.rb

@@ -0,0 +1,45 @@
+# ------------------------------------------------------------------------------
+# Sample rails 3 config
+# ------------------------------------------------------------------------------
+
+# Set your full path to application.
+app_path = "/path/to/app"
+
+# Set unicorn options
+worker_processes 1
+preload_app true
+timeout 180
+listen 9000
+
+# Spawn unicorn master worker for user apps (group: apps)
+user 'apps', 'apps' 
+
+# Fill path to your app
+working_directory app_path
+
+# Should be 'production' by default, otherwise use other env 
+rails_env = ENV['RAILS_ENV'] || 'production'
+
+# Log everything to one file
+stderr_path "log/unicorn.log"
+stdout_path "log/unicorn.log"
+
+# Set master PID location
+pid "#{app_path}/tmp/pids/unicorn.pid"
+
+before_fork do |server, worker|
+  ActiveRecord::Base.connection.disconnect!
+
+  old_pid = "#{server.config[:pid]}.oldbin"
+  if File.exists?(old_pid) && server.pid != old_pid
+    begin
+      Process.kill("QUIT", File.read(old_pid).to_i)
+    rescue Errno::ENOENT, Errno::ESRCH
+      # someone else did our job for us
+    end
+  end
+end
+
+after_fork do |server, worker|
+  ActiveRecord::Base.establish_connection
+end

data/lib/capistrano-unicorn/capistrano_integration.rb

@@ -22,8 +22,8 @@ module CapistranoUnicorn
           task :start, :roles => :app, :except => {:no_release => true} do
             config_path = "#{current_path}/config/unicorn/#{unicorn_env}.rb"
             if remote_file_exists?(config_path)
-              logger.important("Starting...")
-              run "cd #{current_path} && bundle exec unicorn -c #{config_path} -E #{unicorn_env} -D"
+              logger.important("Starting...", "Unicorn")
+              run "cd #{current_path} && BUNDLE_GEMFILE=#{current_path}/Gemfile bundle exec unicorn -c #{config_path} -E #{unicorn_env} -D"
             else
               logger.important("Config file for \"#{unicorn_env}\" environment was not found at \"#{config_path}\"", "Unicorn")
             end

data/lib/capistrano-unicorn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-13 00:00:00.000000000Z
+date: 2011-11-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2153845960 !ruby/object:Gem::Requirement
+  requirement: &2165782000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153845960
+  version_requirements: *2165782000
 description: Capistrano plugin that integrates Unicorn server tasks.
 email: dan.sosedoff@gmail.com
 executables: []
@@ -32,6 +32,7 @@ files:
 - Gemfile
 - README.md
 - capistrano-unicorn.gemspec
+- examples/rails3.rb
 - lib/capistrano-unicorn.rb
 - lib/capistrano-unicorn/capistrano_integration.rb
 - lib/capistrano-unicorn/version.rb
@@ -55,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Unicorn integration for Capistrano