cap-runit 0.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3e6b7e1396dc85e4f664fac65423f7b17eb80e5
-  data.tar.gz: e68549492f3f0e5cf8301dd473b15ea4fe778347
+  metadata.gz: 4d248458e4635f21b235037608eb6f0ded387d48
+  data.tar.gz: 50b7d8bac0241bbd03aee2f8c02bfed69f2e9a2e
 SHA512:
-  metadata.gz: 0fd9c847ffb4cb4fffd273b5cd754b66f1a985427ca1e4c9fb303e7dff41ae4ff69a7d2577374836a0fa9bf2aa03cd50f0eca5bc771db15ace1f68d8d07e73af
-  data.tar.gz: d84be89f74bb843f7f3a676962463e1b6c68c31f8879eac2c0d84fdd670f89d7f2bab9547dd936ecd187e169513895b703685ac2e03678600b710cec392c11d2
+  metadata.gz: a4c28fbf9a20dda07d1a88c3ab3e0db9a4ec5e8ae9e060988b48250286b7c582e39e7ca1c5f7d463458d161773ee5388efeb3e6ee49b9dbff32953b2bddf6a3d
+  data.tar.gz: f5fcec5a9bcac33e42cd8ab2943ea9a8be2c19fb89a3a7aab1992781040402e8be051fc0686caf7d5935c5c235ae4661e9d62d53d0e9de1fa8fda88a652c8d5c

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/README.md

@@ -5,11 +5,16 @@ deploy services using capistrano 3 and run them with runit.
 
 ## Installation
 
-Using bundler: Add `gem 'cap-runit'` to your `Gemfile` and `require 'bundler';
-Bundler.require` to your `Capfile`.
+#### Using bundler
 
-Not using bundler: `gem install cap-runit` and add `require 'capistrano/runit'`
-to your `Capfile`.
+1. Add `gem 'cap-runit'` to your `Gemfile`
+2. Run `bundle install`
+3. Add `require 'bundler'; Bundler.require` to your `Capfile`
+
+#### Without bundler
+
+1. Run `gem install cap-runit`
+2. Add `require 'capistrano/runit' to your `Capfile`
 
 ## Usage
 
@@ -23,6 +28,9 @@ For example, to run sidekiq, you might do something like this:
 ```ruby
 runit_service 'sidekiq' do
 
+  # Sidekiq should only run on servers with role: %w{sidekiq}
+  roles :sidekiq
+
   run <<-EOF
 #!/bin/bash
 cd /var/www/app/current
@@ -59,6 +67,8 @@ automatically.
 ```ruby
 runit_service 'sidekiq' do
 
+  roles :sidekiq
+
   run <<-EOF
 #!/bin/bash -l
 cd /var/www/app/current
@@ -73,6 +83,9 @@ exec svlogd -tt /var/log/sidekiq
 end
 ```
 
+N.B. For this example to work you will need to ensure that `/var/log/sidekiq`
+can be written to by the capistrano user.
+
 ### Crash notifications
 
 If you need to be notified of when a crash happens in your app, you can also
@@ -81,6 +94,8 @@ configure a `finish` script. This is run whenever the `run` script exits.
 ```ruby
 runit_service 'sidekiq' do
 
+  roles :sidekiq
+
   run <<-EOF
 #!/bin/bash -l
 cd /var/www/app/current
@@ -110,8 +125,9 @@ The only configuration variable you need to pass is `runit_service_directory`
 set :runit_service_directory, "/apps/service"
 ```
 
-The service directory needs to be run with `runsvdir` and owned by the
-capistrano user. To configure `runsvdir` you can create the following files:
+This should point to a directory that is being run by runit, and which the
+capistrano user has permission to modify. I suggest setting up something like
+`/apps/service` run by the `deploy` user. This can be done by creating two files:
 
 
 ```bash
@@ -127,10 +143,9 @@ And
 #/etc/service/cap-runit/log/run
 
 #!/bin/sh
+mkdir -p /var/log/cap-runit
 exec svlogd -tt /var/log/cap-runit
 ```
 
 These files should both be owned by root and `chmod +x`. This way the deploy
 user does not need root permissions to reboot a service on deploy.
-
-

data/cap-runit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'cap-runit'
-  gem.version = '0.1'
+  gem.version = '0.2.0'
 
   gem.summary = 'Capistrano 3 Runit integration'
   gem.description = "Template for managing runit directories with capistrano 3"

data/lib/cap-runit.rb

@@ -115,6 +115,14 @@ def runit_service(name, &block)
         execute "sv stop #{runit_service_dir}/#{name}"
       end
     end
+    
+    desc "Force stop #{name}"
+    task :force_stop do
+      on roles(*service.roles) do
+        execute "sv force-stop #{runit_service_dir}/#{name}"
+      end
+    end
+    task :'force-stop' => :force_stop
 
     desc "Restart #{name}"
     task restart: :configure do
@@ -122,6 +130,14 @@ def runit_service(name, &block)
         execute "sv restart #{runit_service_dir}/#{name}"
       end
     end
+    
+    desc "Force restart #{name}"
+    task force_restart: :configure do
+      on roles(*service.roles) do
+        execute "sv force-restart #{runit_service_dir}/#{name}"
+      end
+    end
+    task :'force-restart' => :force_restart
 
     desc "Disable #{name}"
     task :disable do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cap-runit
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.2.0
 platform: ruby
 authors:
 - Conrad Irwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -31,6 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - README.md
 - cap-runit.gemspec
 - lib/cap-runit.rb