capistrano-runit-core 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bddfd41eae20655a062eba33faa322c6e4716913
-  data.tar.gz: 3afac19b6ea4d5aac56a64e51dde1370559892a8
+  metadata.gz: 59d5057025d875e01e940730d8b00748198c7230
+  data.tar.gz: 7f42484232482ce6842c8ae9ab18bd9b7323d708
 SHA512:
-  metadata.gz: a09f9a93a40ce648530165c317ac55028e4c03f62d582f66abf89c8658aab17ee4f09e855f76cbc5fd612607239dc0c68e287604caa3746da8a3dddd3c1c60c4
-  data.tar.gz: 0b474796f623a0d42fae467b71781da1ed596a3f071295e9377240a0cf0886fd460ff72ee9da116951e50ad49a47356806d12e033265f7656146fff504e693b8
+  metadata.gz: ff4f4a10d8298cd66a84da2c7fd4f521405a30a62ced186c9ec87ad7ada52a4417ba2b838a6029fcfb868696a77f1c0d737dc61b54ad4baf4777a5d0c7816d60
+  data.tar.gz: 5d36ea9a82e6947597c1ef8daef7f95c6ea49104a4686484f1bba514ae8daa46125fc91b61d5db974351c6412b68a2f846296eb23b17807e5789e2689dedf2b9

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # capistrano-runit-core
 
+## 0.1.1 (unreleased)
+
+* Path to runit's sv depend on system.
+
 ## 0.1.0
 
 * Extract all supported services to separate gems

data/README.md

@@ -31,7 +31,7 @@ Create run shell script `/etc/sv/runsvdir-your_application/run`:
 ```bash
 #!/bin/sh
 exec 2>&1
-exec chpst -udeployer runsvdir /home/deployer/apps/your_application/runit/enabled
+exec chpst -udeployer:deployer -e /home/deployer/apps/your_application/runit/.env runsvdir /home/deployer/apps/your_application/runit/enabled
 ```
 
 In current example expected what you deploying with `deployer` user to the `/home/deployer/apps/your_application` folder.
@@ -75,6 +75,6 @@ require "capistrano/runit"
 ## Variables
 
 * `runit_roles` -- what host roles uses runit to run processes. Default value: `[:app, :db]`.
-* `runit_sv_path` -- Path to the runit sv binary. Default value: `/sbin/sv`
+* `runit_sv_search_path` -- Path of $PATH where we will try to found sv binary. Default value: `/sbin:/usr/sbin`
 
 

data/capistrano-runit-core.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name        = 'capistrano-runit-core'
-  spec.version     = '0.1.0'
+  spec.version     = '0.2.0'
   spec.summary     = 'Capistrano3 core recipe to manage runit services'
   spec.homepage    = 'http://capistrano-runit.github.io'
   spec.author      = ['Oleksandr Simonov', 'Anton Ageev']

data/lib/capistrano/runit.rb

@@ -27,9 +27,21 @@ module Capistrano
       end
     end
 
-    def check_service(service)
-      if fetch("runit_#{service}_default_hooks")
+    def service_running?(service)
+      service_dir   = enabled_service_dir_for(service)
+      supervise_dir = ::File.join(service_dir, 'supervise')
+      stat_file     = ::File.join(supervise_dir, 'stat')
+      if test("[ -d #{supervise_dir} ]") && test("[ -f #{stat_file} ]")
+        capture(:cat, stat_file).chomp == 'run'
+      else
+        false
+      end
+    end
+
+    def check_service(service, namespace = nil)
+      if fetch("runit_#{service}_default_hooks".to_sym)
         ::Rake::Task['runit:setup'].invoke
+        service = "#{service}:#{namespace}" if namespace
         ::Rake::Task["runit:#{service}:setup"].invoke
         ::Rake::Task["runit:#{service}:enable"].invoke
       end
@@ -63,9 +75,7 @@ module Capistrano
           if test "[ -d #{enabled_service_dir} ]"
             info "'#{service}' runit service already enabled"
           else
-            within "#{enabled_service_dir}" do
-              execute :ln, '-sf', ::File.join(service, service), service
-            end
+            execute :ln, '-snf', service_dir, enabled_service_dir
           end
         else
           error "'#{service}' runit service isn't found. You should run runit:#{service}:setup first."
@@ -85,41 +95,54 @@ module Capistrano
       end
     end
 
-    def start_service(service)
+    def start_service(service, timeout = nil)
       on roles fetch("runit_#{service}_role".to_sym) do
-        runit_execute_command(service, 'start')
+        runit_execute_command(service, 'start', timeout)
       end
     end
 
-    def stop_service(service)
-      pid_path = pid_full_path(fetch("runit_#{service}_pid".to_sym))
+    def stop_service(service, pidfile = true, timeout = nil)
+      pid_path = pid_full_path(fetch("runit_#{service}_pid".to_sym)) if pidfile
       on roles fetch("runit_#{service}_role".to_sym) do
-        if test "[ -f #{pid_path} ]"
-          runit_execute_command(service, 'stop')
+        if pidfile
+          if test "[ -f #{pid_path} ]" && service_running?(service)
+            runit_execute_command(service, 'stop', timeout)
+          else
+            info "'#{service}' is not running yet"
+          end
         else
-          info "'#{service}' is not running yet"
+          if service_running?(service)
+            runit_execute_command(service, 'stop', timeout)
+          else
+            info "'#{service}' is not running yet"
+          end
         end
       end
     end
 
-    def restart_service(service)
+    def restart_service(service, timeout = nil)
       on roles fetch("runit_#{service}_role".to_sym) do
-        runit_execute_command(service, 'restart')
+        runit_execute_command(service, 'restart', timeout)
       end
     end
 
     def kill_hup_service(service)
       on roles fetch("runit_#{service}_role".to_sym) do
-        runit_execute_command(service, '1')
+        runit_execute_command(service, 'hup')
       end
     end
 
-    def runit_execute_command(service, command)
+    def runit_execute_command(service, command, timeout = nil)
+      # check timeout type
+      unless timeout.instance_of?(NilClass) || (timeout.is_a?(Integer) && timeout >= 0)
+        raise ArgumentError.new("'timeout' argument in '#runit_execute_command' method must be nil or positive integer.")
+      end
+
       enabled_service_dir = enabled_service_dir_for(service)
       if test "[ -d #{enabled_service_dir} ]"
-        execute "#{fetch(:runit_sv_path)} #{command} #{enabled_service_dir}"
+        execute "#{host.fetch(:runit_sv_path)} #{"-w #{timeout}" unless timeout.nil?} #{command} #{enabled_service_dir}"
       else
-        error "'#{service}'' runit service isn't enabled."
+        error "'#{service}' runit service isn't enabled."
       end
     end
   end

data/lib/capistrano/tasks/runit.rake

@@ -20,11 +20,25 @@ namespace :runit do
       end
     end
   end
+
+  task :hook do
+    roles(fetch(:runit_roles, [:app, :db])).each do |server|
+      on server do
+        with path: "#{fetch(:runit_sv_search_path)}:$PATH" do
+          server.set :runit_sv_path, capture(:which, :sv)
+        end
+      end
+    end
+  end
+end
+
+Capistrano::DSL.stages.each do |stage|
+  after stage, 'runit:hook'
 end
 
 namespace :load do
   task :defaults do
     set :runit_roles, fetch(:runit_roles, [:app, :db])
-    set :runit_sv_path, '/sbin/sv'
+    set :runit_sv_search_path, '/sbin:/usr/sbin'
   end
 end

data/lib/capistrano/templates/run.erb

@@ -1,3 +1,7 @@
-#!/bin/bash
-cd <%= current_path %>
-<%= runit_command %>
+#!/bin/sh
+if [ -d <%= current_path %> ]; then
+  cd <%= current_path %>
+  <%= _runit_command %>
+else
+  echo "Directory <%= current_path %> is missing. Retrying ..."
+fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-runit-core
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Oleksandr Simonov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Capistrano3 core recipe to manage runit services