vlad-unicorn 2.1.1 → 2.2.0

data/.hgignore

@@ -0,0 +1,11 @@
+syntax: glob
+.DS_Store
+*~
+\#*\#
+.\#*
+*.sw?
+
+syntax: regexp
+^pkg/
+^doc/
+^.yardoc$

data/.hgtags

@@ -0,0 +1,4 @@
+d25315ab65a371c98cca14a63572a18356417738 rel-2.0.0
+bdc7c2851152cf080888a2c6d5d5bf22fc04f5b2 v2.1.0
+bdc7c2851152cf080888a2c6d5d5bf22fc04f5b2 semver
+90fa0693a4a0b49241357d1b7b03df6b064a14e9 v2.1.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.2.0 / 2012-11-09
+
+* 1 minor enhancement
+
+  * Add a new task, vlad:reload_app, to send SIGUSR2 to Unicorn
+    (Mathieu Lemoine). vlad:start_app still uses SIGHUP.
+
 === 2.1.1 / 2011-12-28
 
 * 1 bug fix

data/Manifest.txt

@@ -1,4 +1,6 @@
 .autotest
+.hgignore
+.hgtags
 History.txt
 Manifest.txt
 README.txt

data/README.txt

@@ -63,11 +63,21 @@ unicorn_use_sudo::      Whether to use sudo to run the 'unicorn' command on
 For more on specific issues when deploying Rails applications, see
 rails-configuration.txt[link:docs/rails-configuration_txt.html].
 
+== TASKS:
+
+start_app, stop_app::   Vlad's built-in tasks to start and stop the application
+                        processes, adapted for Unicorn.
+
+reload_app::            Reload unicorn (in case <tt>preload_app == true</tt>).
+                        If this is the case, you have to adapt your +before_fork+
+                        hook so it kills the old unicorn master and workers.
+                        Cf. "Getting started with unicorn"[http://codelevy.com/2010/02/09/getting-started-with-unicorn.html].
+
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2010 Kevin Bullock and the rest of the Ruby Hit Squad
+Copyright (c) 2012 Kevin Bullock and the rest of the Ruby Hit Squad
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/docs/rails-configuration.txt

@@ -11,12 +11,23 @@ environment variables in the unicorn.rb config file, like so:
     ENV['RAILS_ENV'] = 'production'
     ENV['RAILS_RELATIVE_URL_ROOT'] = '/prefix'
 
+To use +RAILS_RELATIVE_URL_ROOT+ with Rails 3.x, you can use your project's rackup
+file (config.ru) to map the application to a prefix:
+
+     # This file is used by Rack-based servers to start the application.
+     
+     require ::File.expand_path('../config/environment',  __FILE__)
+    -run MyApp::Application
+    +app = MyApp::Application
+    +app = Rack::URLMap.new(ENV['RAILS_RELATIVE_URL_ROOT'] => app) if
+    +  ENV['RAILS_RELATIVE_URL_ROOT']
+    +run app
+
 == Using with Rails 2.3 and Bundler
 
 When using Rails 2.3 with Bundler, you have to <code>bundle exec</code>
 everything. This can be done by setting +unicorn_command+ in your deploy.rb.
 Since Vlad doesn't change into the +RAILS_ROOT+ directory before attempting to
-run remote commands, though, you have to explicitly tell Bundler where the
-Gemfile is:
+run remote commands, though, you have to explicitly tell it to do so:
 
-    set :unicorn_command, "bundle --gemfile=#{current_path}/Gemfile exec unicorn_rails"
+    set :unicorn_command, "cd #{current_path} && bundle exec unicorn_rails"

data/lib/vlad/unicorn.rb

@@ -10,4 +10,9 @@ namespace :vlad do
   remote_task :start_app, :roles => :app do
     Vlad::Unicorn.start(unicorn_rackup)
   end
+
+  desc "Reload the app servers"
+  remote_task :reload_app, :roles => :app do
+    Vlad::Unicorn.reload(unicorn_rackup)
+  end
 end

data/lib/vlad/unicorn_common.rb

@@ -2,7 +2,7 @@ require 'vlad'
 
 module Vlad
   module Unicorn
-    VERSION = '2.1.1' #:nodoc:
+    VERSION = '2.2.0' #:nodoc:
 
     # Runs +cmd+ using sudo if the +:unicorn_use_sudo+ variable is set.
     def self.maybe_sudo(cmd)
@@ -23,6 +23,12 @@ module Vlad
       maybe_sudo %(sh -c '#{cmd}')
     end
 
+    def self.reload(opts = '')
+      cmd = signal('USR2')
+      cmd << %( || (#{unicorn_command} -D --config-file #{unicorn_config} #{opts}))
+      maybe_sudo %(sh -c '#{cmd}')
+    end
+
     def self.stop
       cmd = signal('QUIT')
       cmd << %( || echo "stale pid file #{unicorn_pid}")

data/lib/vlad/unicorn_rails.rb

@@ -10,4 +10,9 @@ namespace :vlad do
   remote_task :start_app, :roles => :app do
     Vlad::Unicorn.start
   end
+
+  desc "Reload the app servers"
+  remote_task :reload_app, :roles => :app do
+    Vlad::Unicorn.reload
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vlad-unicorn
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
+  hash: 7
+  prerelease: false
   segments: 
   - 2
-  - 1
-  - 1
-  version: 2.1.1
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Kevin R. Bullock
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-01 00:00:00 Z
+date: 2012-11-09 00:00:00 -06:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: vlad
@@ -32,36 +33,22 @@ dependencies:
         version: "2.0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
-  type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 47
         segments: 
         - 2
-        - 13
-        version: "2.13"
+        - 8
+        - 0
+        version: 2.8.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 description: |-
   Unicorn app server support for Vlad. Adds support for vlad:start_app and
   vlad:stop_app using Unicorn[http://unicorn.bogomips.org/].
@@ -78,6 +65,8 @@ extra_rdoc_files:
 - docs/rails-configuration.txt
 files: 
 - .autotest
+- .hgignore
+- .hgtags
 - History.txt
 - Manifest.txt
 - README.txt
@@ -87,7 +76,7 @@ files:
 - lib/vlad/unicorn_common.rb
 - lib/vlad/unicorn_rails.rb
 - test/test_vlad_unicorn.rb
-- .gemtest
+has_rdoc: true
 homepage: http://bitbucket.org/krbullock/vlad-unicorn/
 licenses: []
 
@@ -118,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hitsquad
-rubygems_version: 1.8.15
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Unicorn app server support for Vlad