o2h 0.1.10 → 0.1.11

data/lib/o2h.rb

@@ -18,6 +18,9 @@ module O2h
     require 'newrelic_rpm'
   end
 
+  def host(recipe)
+    File.expand_path(File.join(%w{o2h recipes host} << recipe + ".rb"), File.dirname(__FILE__))
+  end
 end
 
 O2h.initialize!

data/lib/o2h/capistrano/deploy/bluepill.rb

@@ -0,0 +1 @@
+O2h.capistrano.load O2h.host('bluepill')

data/lib/o2h/capistrano/deploy/passenger.rb

@@ -0,0 +1 @@
+O2h.capistrano.load O2h.host('passenger')

data/lib/o2h/capistrano/deploy/static.rb

@@ -0,0 +1 @@
+O2h.capistrano.load O2h.host('static')

data/lib/o2h/capistrano/deploy/unicorn.rb

@@ -0,0 +1 @@
+O2h.capistrano.load O2h.host('unicorn')

data/lib/o2h/recipes/host/unicorn.rb

@@ -1,16 +1,20 @@
+set(:unicorn_binary){ "bundle exec unicorn" }
+set(:unicorn_config){ "config/unicorn.rb" }
+set(:unicorn_pid){ "#{shared_path}/pids/unicorn.pid" }
+
 namespace :deploy do
   desc "Zero-downtime restart of Unicorn"
   task :restart, :except => { :no_release => true } do
-    run "kill -s USR2 `cat /tmp/unicorn.my_site.pid`"
+    run "kill -s USR2 `cat #{unicorn_pid}`"
   end
 
   desc "Start unicorn"
   task :start, :except => { :no_release => true } do
-    run "cd #{current_path} ; bundle exec unicorn_rails -c config/unicorn.rb -D"
+    run "cd #{current_path}; #{unicorn_binary} -E #{rails_env} -c #{unicorn_config} -D"
   end
 
   desc "Stop unicorn"
   task :stop, :except => { :no_release => true } do
-    run "kill -s QUIT `cat /tmp/unicorn.my_site.pid`"
+    run "kill -s QUIT `cat #{unicorn_pid}`"
   end
 end

data/lib/o2h/version.rb

@@ -1,3 +1,3 @@
 module O2h
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: o2h
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000Z
+date: 2011-12-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
-  requirement: &70273601463400 !ruby/object:Gem::Requirement
+  requirement: &70365463529100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70273601463400
+  version_requirements: *70365463529100
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70273601460900 !ruby/object:Gem::Requirement
+  requirement: &70365463522420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70273601460900
+  version_requirements: *70365463522420
 - !ruby/object:Gem::Dependency
   name: rvm
-  requirement: &70273601458720 !ruby/object:Gem::Requirement
+  requirement: &70365463521560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70273601458720
+  version_requirements: *70365463521560
 - !ruby/object:Gem::Dependency
   name: pg_dumper
-  requirement: &70273601457500 !ruby/object:Gem::Requirement
+  requirement: &70365463520380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *70273601457500
+  version_requirements: *70365463520380
 description: Collection of recipes and gem dependencies for o2h deployment
 email:
 - michal@o2h.cz
@@ -71,7 +71,11 @@ files:
 - Rakefile
 - lib/o2h.rb
 - lib/o2h/capistrano.rb
+- lib/o2h/capistrano/deploy/bluepill.rb
+- lib/o2h/capistrano/deploy/passenger.rb
+- lib/o2h/capistrano/deploy/static.rb
 - lib/o2h/capistrano/deploy/strategy/git.rb
+- lib/o2h/capistrano/deploy/unicorn.rb
 - lib/o2h/recipes.rb
 - lib/o2h/recipes/bundler.rb
 - lib/o2h/recipes/config.rb