vlad-unicorn 2.2.1 → 2.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA512: 
+  data.tar.gz: 367c63d4fe4d88eecf4e5bef1e805bd0ba5aaa37b472bc0068c10dfcff8e6d55636debad5e58f30d16e72dfb847be3d874d8f096006cfa5cf4f9ba02239f92a2
+  metadata.gz: 03a7a527d6b060454be27e5d629a5735f379a12a908aec45c56058e346e8583dfad0057525b59f084224816a63d7e8cdd0cefcbb4b9417e9710c50d004dd8a49
+SHA1: 
+  data.tar.gz: 163cd11fb51aa38a671dddf33662cd56a02e8eb9
+  metadata.gz: d3ca64d3f88249e6bcdafe4a9a326712893eecca

data/.hgtags

@@ -3,3 +3,5 @@ bdc7c2851152cf080888a2c6d5d5bf22fc04f5b2 v2.1.0
 bdc7c2851152cf080888a2c6d5d5bf22fc04f5b2 semver
 90fa0693a4a0b49241357d1b7b03df6b064a14e9 v2.1.1
 0fa4ab85e99e8676d791db49fae89f81f164674f v2.2.0
+4595d1cc44fec363ac3f18434a0e5b3e9679b71d v2.2.1
+cff28cee81113b40daaa41ff2bf29a8b0a7bc873 v2.3.0

data/History.txt

@@ -1,3 +1,24 @@
+=== 2.3.1 / 2013-04-18
+
+* 1 bug fix
+
+  * Generate the command to start Unicorn correctly.
+
+=== 2.3.0 / 2013-04-17
+
+* 3 minor enhancements
+
+  * Pass an environment to Unicorn, default to rails_env (if present) or
+    'production'. (Mathieu Lemoine) (BC)
+  * Create shared/log and shared/pids directories on vlad:setup_app, even for
+    non-Rails apps.
+  * Add an option to trivially enable using `bundle exec`.
+
+* 2 bug fixes
+
+  * Fix broken shell-quoting of sudo commands
+  * Quote config file path when passing it to unicorn
+
 === 2.2.1 / 2013-03-08
 
 * 1 bug fix

data/README.txt

@@ -59,6 +59,18 @@ unicorn_rackup::        The location of the rackup file unicorn should load.
 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.
+unicorn_env::           Environment to be given to unicorn (value for +-E+).
+                        Default value is based on +vlad/rails+'s +rails_env+.
+                        If +rails_env+ is not defined, +production+ is used as
+                        default value. To disable passing an environment, set to
+                        +nil+.
+unicorn_use_bundler::   Whether to use <tt>bundle exec</tt> to run the 'unicorn'
+                        command on the remote host. Defaults to false.
+unicorn_bundle_cmd::    How to invoke <tt>bundle exec</tt>. Defaults to
+                        <tt>cd #{current_path} && bundle exec</tt>. If you have
+                        defined +bundle_cmd+ for Bundler's built-in deployment
+                        tasks, vlad-unicorn will use that in place of +bundle+
+                        in the above default.
 
 For more on specific issues when deploying Rails applications, see
 rails-configuration.txt[link:docs/rails-configuration_txt.html].

data/docs/rails-configuration.txt

@@ -1,33 +1,26 @@
 = Configuring Unicorn for Rails
 
-== Setting environment and prefix
+== Setting the environment
 
-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).
-Both of these can just as easily be done by setting the appropriate
-environment variables in the unicorn.rb config file, like so:
+As of 2.3.0, vlad-unicorn allows you to pass the Rails or Rack environment to
+the +unicorn+ command (the +--env+ option):
+
+    set :unicorn_env, 'production'
+
+This can also be done by setting the appropriate environment variable 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 Bundler
 
-== Using with Rails 2.3 and Bundler
+When deploying with Bundler, it's often more robust to <code>bundle exec</code>
+everything. This can be done by setting +unicorn_use_bundler+ to true in your
+deploy.rb. By default, this will change into the current release directory and
+run +bundle exec+ there.
 
-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 it to do so:
+This can be changed by setting +unicorn_bundle_cmd+. One alternate approach is
+to pass the full Gemfile path using the BUNDLE_GEMFILE environment variable:
 
-    set :unicorn_command, "cd #{current_path} && bundle exec unicorn_rails"
+    set :unicorn_bundle_cmd, "BUNDLE_GEMFILE=#{current_path}/Gemfile bundle exec"

data/lib/vlad/unicorn_common.rb

@@ -2,30 +2,41 @@ require 'vlad'
 
 module Vlad
   module Unicorn
-    VERSION = '2.2.1' #:nodoc:
+    VERSION = '2.3.1' #:nodoc:
 
     # Runs +cmd+ using sudo if the +:unicorn_use_sudo+ variable is set.
     def self.maybe_sudo(cmd)
       if unicorn_use_sudo
-        sudo %(sh -c '#{cmd.gsub(/'/, "'\''")}')
+        sudo %(sh -c '#{cmd.gsub(/'/, "'\\''")}')
       else
         run cmd
       end
     end
 
+    def self.start_unicorn(opts = '')
+      cmd = %(#{unicorn_command} -D --config-file "#{unicorn_config}")
+      cmd << %( -E "#{unicorn_env}") if unicorn_env
+      cmd << %( #{opts}) if opts and !opts.empty?
+      if unicorn_use_bundler
+        [unicorn_bundle_cmd, cmd].join(' ')
+      else
+        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}))
+      cmd << %( || (#{start_unicorn(opts)}))
       maybe_sudo cmd
     end
 
     def self.reload(opts = '')
       cmd = signal('USR2')
-      cmd << %( || (#{unicorn_command} -D --config-file #{unicorn_config} #{opts}))
+      cmd << %( || (#{start_unicorn(opts)}))
       maybe_sudo cmd
     end
 
@@ -42,6 +53,13 @@ namespace :vlad do
   set(:unicorn_config)      { "#{current_path}/config/unicorn.rb" }
   set :unicorn_use_sudo,    false
   set(:unicorn_pid)         { "#{shared_path}/pids/unicorn.pid" }
+  set(:unicorn_env)         { Rake::RemoteTask.fetch(:rails_env, 'production') }
+  set(:unicorn_bundle_cmd)  {
+    "cd #{current_path} && #{Rake::RemoteTask.fetch(:bundle_cmd, 'bundle')} exec"
+  }
+  set :unicorn_use_bundler, false
+  shared_paths['log'] ||= 'log'
+  shared_paths['pids'] ||= 'tmp/pids'
 
   desc "Stop the app servers"
   remote_task :stop_app, :roles => :app do

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vlad-unicorn
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
-  segments: 
-  - 2
-  - 2
-  - 1
-  version: 2.2.1
+  version: 2.3.1
 platform: ruby
 authors: 
 - Kevin R. Bullock
@@ -15,40 +9,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-08 00:00:00 -06:00
-default_executable: 
+date: 2013-04-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: vlad
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
         version: "2.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
-        version: 2.8.0
+        version: "4.0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "3.5"
+  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/].
@@ -76,10 +68,12 @@ 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: []
 
+metadata: {}
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -87,29 +81,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - &id004 
+    - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  - *id004
 requirements: []
 
 rubyforge_project: hitsquad
-rubygems_version: 1.3.7
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Unicorn app server support for Vlad
 test_files: 
 - test/test_vlad_unicorn.rb