improve unicorn/bluepill integration

app/attributes/unicorn.rb

@@ -1,3 +1,3 @@
-default[:unicorn][:stand_alone]  = true
+default[:unicorn][:bundled]      = false
 default[:unicorn][:timeout]      = 30
 default[:unicorn][:cow_friendly] = false

app/metadata.rb

@@ -3,7 +3,7 @@
 license          "Apache 2.0"
 description      "Installs/Configures a Rails app"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.1.0"
+version          "0.1.1"
 
 supports "ubuntu"
 

app/recipes/bluepill.rb

@@ -1,13 +1,29 @@
 include_recipe "bluepill"
 
+if node[:unicorn][:bundled]
+  # Bundling unicorn with the app is the preferred method.
+  red_unicorn = "bundle exec red_unicorn"
+else
+  # Otherwise attempt to find gems bin path. This smells bad to me.
+  require "yaml"
+  path = ""
+  env = YAML::load(`gem environment`)["RubyGems Environment"]
+  env.each do |e|
+    path = e["EXECUTABLE DIRECTORY"] if e.key?("EXECUTABLE DIRECTORY")
+  end
+  red_unicorn = "red_unicorn --unicorn-exec #{path}/unicorn"
+end
+
 template "/etc/bluepill/app.pill" do
   source "bluepill.erb"
-  variables( :environment => node[:app][:rails_env],
+  variables( :red_unicorn => red_unicorn,
+             :environment => node[:app][:rails_env],
              :start_grace_time => node[:bluepill][:start_grace_time],
              :stop_grace_time => node[:bluepill][:stop_grace_time],
              :restart_grace_time => node[:bluepill][:restart_grace_time],
              :mem_usage_mb => node[:bluepill][:mem_usage_mb],
              :cpu_usage_percent => node[:bluepill][:cpu_usage_percent] )
+  notifies :load, "bluepill_service[app]"
 end
 
 bluepill_service "app" do

app/recipes/unicorn.rb

@@ -1,4 +1,4 @@
-gem_package "red_unicorn" if node[:unicorn][:stand_alone]
+gem_package "red_unicorn" unless node[:unicorn][:bundled]
 
 directory "/etc/unicorn"
 

app/templates/default/bluepill.erb

@@ -3,9 +3,9 @@ Bluepill.application("app") do |app|
     process.pid_file = "/var/run/unicorn/unicorn.pid"
     process.working_dir = "/var/www/current"
 
-    process.start_command = "red_unicorn --unicorn-exec /usr/local/bin/unicorn --env <%= @environment %> start"
-    process.stop_command = "red_unicorn --unicorn-exec /usr/local/bin/unicorn stop"
-    process.restart_command = "red_unicorn --unicorn-exec /usr/local/bin/unicorn restart"
+    process.start_command = "<%= @red_unicorn %> --env <%= @environment %> start"
+    process.stop_command = "<%= @red_unicorn %> stop"
+    process.restart_command = "<%= @red_unicorn %> restart"
 
     process.uid = process.gid = "www-data"