runit-man 1.2 → 1.3

data/bin/runit-man.rb

@@ -14,6 +14,10 @@ OptionParser.new { |op|
   op.on('-b addr')   { |val| RunitMan.set :bind, val }
   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
+    RunitMan.register_as_runit_service
+    exit
+  end
 }.parse!(ARGV.dup)
 
 RunitMan.run!

data/lib/runit-man/app.rb

@@ -8,6 +8,8 @@ require 'runit-man/helpers'
 
 R18n::Filters.on :variables
 
+GEM_FOLDER = File.expand_path(File.join('..', '..'), File.dirname(__FILE__)).freeze
+
 CONTENT_TYPES = {
   :html => 'text/html',
   :css  => 'text/css',
@@ -22,7 +24,7 @@ class RunitMan < Sinatra::Base
   set :logging,      true
   set :dump_errors,  true
   set :raise_errors, false
-  set :root,         File.expand_path(File.join('..', '..'), File.dirname(__FILE__))
+  set :root,         GEM_FOLDER
 
   register Sinatra::R18n
 
@@ -62,7 +64,8 @@ class RunitMan < Sinatra::Base
   end
 
   def log_action(name, text)
-    addr = request.env.include?('X_REAL_IP') ? request.env['X_REAL_IP'] : request.env['REMOTE_ADDR']
+    env  = request.env
+    addr = env.include?('X_REAL_IP') ? env['X_REAL_IP'] : env['REMOTE_ADDR']
     puts "#{addr} - - [#{Time.now}] \"Do #{text} on #{name}\""
   end
 
@@ -74,4 +77,17 @@ class RunitMan < Sinatra::Base
     log_action(name, action)
     ''
   end
+
+  class << self
+    def register_as_runit_service
+      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')}")
+    end
+
+  private
+    def do_cmd(command)
+      system(command) or raise "Cannot execute #{command}"
+    end
+  end
 end

data/sv/run

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: "1.3"
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -92,9 +92,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: |
-  runit-man is simple web frontend for runit.
-
+description: |+
+  Simple runit web management tool.
+  
+  Server will run by runit-man.rb script.
+  
+  Take a look at its options:
+   -p - Port to listen (4567 by default)
+   -b - IP Address to bind (0.0.0.0 by default)
+   -a - Directory of activated services (/etc/service by default)
+   -f - Directory of all known services (/etc/sv by default)
+   -r - Register runit-man as runit service (127.0.0.1:12343 by default)
+  
+  Usually you need thin or mongrel gem to run runit-man fine. 
+    gem install thin
+  
+  Any localization can be done by editing of ./i18n/*.yml locale files.
+  
+  Yours sincerely,
+    Akzhan.
+  
 email: akzhan.abdulin@gmail.com
 executables: 
 - runit-man.rb
@@ -128,7 +145,7 @@ files:
 - sv/run
 - sv/log/run
 has_rdoc: true
-homepage: 
+homepage: http://github.com/akzhan/runit-man
 licenses: []
 
 post_install_message: