vlad-unicorn 2.0.0 → 2.1.0

data/History.txt

@@ -1,3 +1,11 @@
+=== 2.1.0 / 2011-09-30
+
+* 1 minor enhancement
+
+  * Now uses SIGHUP to restart
+
+* Added documentation on use with Rails 2.3 apps with Bundler
+
 === 2.0.0 / 2010-09-18
 
 * 1 major enhancement

data/README.txt

@@ -29,6 +29,9 @@ or for legacy Rails (1.2.x thru 2.2.x) apps
     rescue LoadError
     end
 
+For more on specific issues when deploying Rails applications, see
+rails-configuration.txt[link:docs/rails-configuration_txt.html].
+
 == REQUIREMENTS:
 
 * Vlad[http://rubyhitsquad.com/Vlad_the_Deployer.html]
@@ -57,7 +60,8 @@ unicorn_use_sudo::      Whether to use sudo to run the 'unicorn' command on
                         the remote host. Probably necessary if you specify a
                         user and group in unicorn.rb.
 
-Also see rails-configuration.txt.
+For more on specific issues when deploying Rails applications, see
+rails-configuration.txt[link:docs/rails-configuration_txt.html].
 
 == LICENSE:
 

data/Rakefile

@@ -10,7 +10,7 @@ Hoe.spec 'vlad-unicorn' do
   developer('Kevin R. Bullock', 'kbullock@ringworld.org')
   extra_deps << ['vlad', '~> 2.0']
   clean_globs << '.yardoc'
-  self.hg_release_tag_prefix = 'rel-'
+  self.hg_release_tag_prefix = 'v'
 end
 
 # vim: syntax=ruby

data/docs/rails-configuration.txt

@@ -1,5 +1,7 @@
 = Configuring Unicorn for Rails
 
+== Setting environment and prefix
+
 The astute observer will notice the lack of variables in vlad-unicorn to set
 the Rails environment or a path prefix for the app (the +unicorn_rails+
 command allows this with with the +--env+ and +--path+ options, respectively).
@@ -8,3 +10,13 @@ environment variables in the unicorn.rb config file, like so:
 
     ENV['RAILS_ENV'] = 'production'
     ENV['RAILS_RELATIVE_URL_ROOT'] = '/prefix'
+
+== 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:
+
+    set :unicorn_command, "bundle --gemfile=#{current_path}/Gemfile exec unicorn_rails"

data/lib/vlad/unicorn.rb

@@ -8,7 +8,6 @@ namespace :vlad do
 
   desc "(Re)Start the app servers"
   remote_task :start_app, :roles => :app do
-    Rake::Task['vlad:stop_app'].invoke
-    Vlad::Unicorn.maybe_sudo unicorn(unicorn_rackup)
+    Vlad::Unicorn.start(unicorn_rackup)
   end
 end

data/lib/vlad/unicorn_common.rb

@@ -2,9 +2,9 @@ require 'vlad'
 
 module Vlad
   module Unicorn
-    VERSION = '2.0.0' #:nodoc:
+    VERSION = '2.1.0' #:nodoc:
 
-    # Runs +cmd+ using sudo if the +:merb_use_sudo+ variable is set.
+    # Runs +cmd+ using sudo if the +:unicorn_use_sudo+ variable is set.
     def self.maybe_sudo(cmd)
       if unicorn_use_sudo
         sudo cmd
@@ -12,29 +12,33 @@ module Vlad
         run cmd
       end
     end
+
+    def self.signal(sig = '0')
+      %(test -s "#{unicorn_pid}" && kill -#{sig} `cat "#{unicorn_pid}"`)
+    end
+
+    def self.start(opts = '')
+      cmd = signal('HUP')
+      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}")
+      maybe_sudo %(sh -c '#{cmd}')
+    end
   end
 end
 
 namespace :vlad do
-
   set :unicorn_command,     "unicorn"
   set(:unicorn_config)      { "#{current_path}/config/unicorn.rb" }
   set :unicorn_use_sudo,    false
   set(:unicorn_pid)         { "#{shared_path}/pids/unicorn.pid" }
 
-  def unicorn(opts = '')
-    cmd = "#{unicorn_command} -D --config-file #{unicorn_config}"
-    cmd << " #{opts}"
-    cmd
-  end
-
   desc "Stop the app servers"
   remote_task :stop_app, :roles => :app do
-    cmd = []
-    cmd << %(if [ -f "#{unicorn_pid}" ])
-    cmd << %(then kill `cat #{unicorn_pid}` || echo "stale pid file #{unicorn_pid}")
-    cmd << %(fi)
-    Vlad::Unicorn.maybe_sudo %Q(sh -c '#{cmd.join("; ")}')
+    Vlad::Unicorn.stop
   end
-
 end

data/lib/vlad/unicorn_rails.rb

@@ -8,7 +8,6 @@ namespace :vlad do
 
   desc "(Re)Start the app servers"
   remote_task :start_app, :roles => :app do
-    Rake::Task['vlad:stop_app'].invoke
-    Vlad::Unicorn.maybe_sudo unicorn
+    Vlad::Unicorn.start
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vlad-unicorn
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 0
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Kevin R. Bullock
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-18 00:00:00 -05:00
-default_executable: 
+date: 2011-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: vlad
@@ -34,37 +33,21 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 35
         segments: 
         - 2
-        - 0
+        - 9
         - 4
-        version: 2.0.4
+        version: 2.9.4
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 6
-        - 1
-        version: 2.6.1
-  type: :development
-  version_requirements: *id003
 description: |-
   Unicorn app server support for Vlad. Adds support for vlad:start_app and
   vlad:stop_app using Unicorn[http://unicorn.bogomips.org/].
@@ -90,7 +73,7 @@ files:
 - lib/vlad/unicorn_common.rb
 - lib/vlad/unicorn_rails.rb
 - test/test_vlad_unicorn.rb
-has_rdoc: true
+- .gemtest
 homepage: http://bitbucket.org/krbullock/vlad-unicorn/
 licenses: []
 
@@ -121,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hitsquad
-rubygems_version: 1.3.7
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Unicorn app server support for Vlad