runit-man 1.3 → 1.4

data/bin/runit-man.rb

@@ -11,7 +11,7 @@ RunitMan.set :all_services_directory,    '/etc/sv'
 OptionParser.new { |op|
   op.on('-s server') { |val| RunitMan.set :server, val }
   op.on('-p port')   { |val| RunitMan.set :port, val.to_i }
-  op.on('-b addr')   { |val| RunitMan.set :bind, val }
+  op.on('-b addr')   { |val| RunitMan.set :bind, val } if RunitMan.respond_to?(:bind)
   op.on('-a active_services_directory (/etc/service by default)') { |val| RunitMan.set :active_services_directory, val }
   op.on('-f all_services_directory (/etc/sv by default)')         { |val| RunitMan.set :all_services_directory, val }
   op.on_tail('-r', '--register', 'Register as runit service') do

data/lib/runit-man/app.rb

@@ -1,6 +1,4 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
+require 'erubis'
 require 'sinatra/base'
 require 'sinatra/r18n'
 require 'runit-man/erb-to-erubis'
@@ -80,6 +78,7 @@ class RunitMan < Sinatra::Base
 
   class << self
     def register_as_runit_service
+      create_run_script
       return if File.symlink?(File.join(RunitMan.all_services_directory, 'runit-man'))
       do_cmd("ln -sf #{File.join(GEM_FOLDER, 'sv')} #{File.join(RunitMan.all_services_directory, 'runit-man')}")
       do_cmd("ln -sf #{File.join(RunitMan.all_services_directory, 'runit-man')} #{File.join(RunitMan.active_services_directory, 'runit-man')}")
@@ -89,5 +88,19 @@ class RunitMan < Sinatra::Base
     def do_cmd(command)
       system(command) or raise "Cannot execute #{command}"
     end
+
+    def create_run_script
+      script_name = File.join(GEM_FOLDER, 'sv', 'run')
+      File.open(script_name, 'w') do |f|
+        f.print Erubis::Eruby.new(IO.read(script_name + '.erb')).result(
+          :all_services_directory    => RunitMan.all_services_directory,
+          :active_services_directory => RunitMan.active_services_directory,
+          :port                      => RunitMan.port,
+          :bind                      => RunitMan.respond_to?(:bind) ? RunitMan.bind : nil,
+          :server                    => RunitMan.server
+        )
+      end
+      File.chmod(0755, script_name)
+    end
   end
 end

data/lib/runit-man/service_info.rb

@@ -12,10 +12,8 @@ class ServiceInfo
   end
 
   def stat
-    return 'inactive' unless supervise?
-    r = 'indeterminate'
-    File.open(File.join(supervise_folder, 'stat'), 'r') { |f| r = f.gets }
-    r
+    r = data_from_file(File.join(supervise_folder, 'stat'))
+    r ? r : 'inactive'
   end
 
   def active?
@@ -53,23 +51,11 @@ class ServiceInfo
   end
 
   def pid
-    r = nil
-    if supervise?
-      File.open(File.join(supervise_folder, 'pid'), 'r') { |f| r = f.gets }
-    end
-    r = r.chomp unless r.nil?
-    r = nil if r == ''
-    r
+    data_from_file(File.join(supervise_folder, 'pid'))
   end
 
   def log_pid
-    r = nil
-    if logged?
-      File.open(File.join(log_supervise_folder, 'pid'), 'r') { |f| r = f.gets }
-    end
-    r = r.chomp unless r.nil?
-    r = nil if r == ''
-    r
+    data_from_file(File.join(log_supervise_folder, 'pid'))
   end
 
   def log_file_location
@@ -103,6 +89,13 @@ private
     File.directory?(supervise_folder)
   end
 
+  def data_from_file(file_name)
+    return nil unless File.readable?(file_name)
+    r = IO.read(file_name)
+    r = r.chomp unless r.nil?
+    r.empty? ? nil : r
+  end
+
   def send_signal!(signal)
     return unless supervise?
     File.open(File.join(supervise_folder, 'control'), 'w') { |f| f.print signal.to_s }

data/sv/run.erb

@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec runit-man.rb<% if server.kind_of?(String) %> -s "<%= server %>"<% end %><% if bind %> -b <%= bind %><% end %> -p <%= port %> -a "<%= active_services_directory %>" -f "<%= all_services_directory %>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  version: "1.3"
+  version: "1.4"
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -142,8 +142,8 @@ files:
 - views/_service_info.erb
 - i18n/ru.yml
 - i18n/en.yml
-- sv/run
 - sv/log/run
+- sv/run.erb
 has_rdoc: true
 homepage: http://github.com/akzhan/runit-man
 licenses: []

data/sv/run

@@ -1,3 +0,0 @@
-#!/bin/sh
-exec 2>&1
-exec runit-man.rb -b 127.0.0.1 -p 12343