runit-man 2.2.9 → 2.3.1

data/lib/runit-man/app.rb

@@ -26,9 +26,10 @@ class RunitMan < Sinatra::Base
     :js   => 'application/x-javascript',
     :json => 'application/json'
   }.freeze
-  DEFAULT_LOGGER = 'svlogd'.freeze
+  DEFAULT_LOGGER              = 'svlogd'.freeze
+  DEFAULT_ALL_SERVICES_DIR    = '/etc/sv'.freeze
+  DEFAULT_ACTIVE_SERVICES_DIR = '/etc/service'.freeze
 
-	set :logger_option, DEFAULT_LOGGER
   set :environment,   :production
   set :static,        true
   set :logging,       true
@@ -228,6 +229,17 @@ class RunitMan < Sinatra::Base
   end
 
   class << self
+    def exec_rackup(command)
+      ENV['RUNIT_ALL_SERVICES_DIR']    = RunitMan.all_services_directory
+      ENV['RUNIT_ACTIVE_SERVICES_DIR'] = RunitMan.active_services_directory
+      ENV['RUNIT_LOGGER']              = RunitMan.logger
+      ENV['RUNIT_MAN_VIEW_FILES']      = RunitMan.files_to_view.join(',')
+      ENV['RUNIT_MAN_CREDENTIALS']     = RunitMan.allowed_users.keys.map { |user| "#{user}:#{RunitMan.allowed_users[user]}" }.join(',')
+
+      Dir.chdir(File.dirname(__FILE__))
+      exec(command)
+    end
+
     def register_as_runit_service
       all_r_dir    = File.join(RunitMan.all_services_directory, 'runit-man')
       active_r_dir = File.join(RunitMan.active_services_directory, 'runit-man')
@@ -263,7 +275,7 @@ class RunitMan < Sinatra::Base
     end
 
     def logger
-      settings.logger_option || DEFAULT_LOGGER
+      settings.logger_option
     end
 
     def prepare_to_run

data/lib/runit-man/config.ru

@@ -0,0 +1,24 @@
+$LOAD_PATH.unshift File.expand_path('..', File.dirname(__FILE__))
+
+require 'runit-man/app'
+
+RunitMan.set :active_services_directory, ENV['RUNIT_ACTIVE_SERVICES_DIR'] || RunitMan::DEFAULT_ACTIVE_SERVICES_DIR
+RunitMan.set :all_services_directory,    ENV['RUNIT_ALL_SERVICES_DIR'] || RunitMan::DEFAULT_ALL_SERVICES_DIR
+RunitMan.set :logger_option,             ENV['RUNIT_LOGGER'] || RunitMan::DEFAULT_LOGGER
+
+if ENV['RUNIT_MAN_VIEW_FILES']
+  ENV['RUNIT_MAN_VIEW_FILES'].split(/\s*\,\s*/).each do |floc|
+    RunitMan.enable_view_of(floc)
+  end
+end
+
+if ENV['RUNIT_MAN_CREDENTIALS']
+  ENV['RUNIT_MAN_CREDENTIALS'].split(/\s*\,\s*/).each do |cred|
+    RunitMan.add_user(*(cred.split(':', 2)))
+  end
+end
+
+RunitMan.prepare_to_run
+
+run RunitMan
+

data/lib/runit-man/helpers.rb

@@ -63,11 +63,11 @@ module Helpers
     raw   = options[:raw] || false
     hint  = " title=\"#{h(hint)}\"" unless hint.empty?
     blank = blank ? ' target="_blank"' : ''
-    "<a#{hint}#{blank} href=\"/#{h(name)}/log#{ (count != 100) ? "/#{count}" : '' }#{ raw ? '.txt' : '' }#footer\">#{h(title)}</a>"
+    "<a#{hint}#{blank} href=\"/#{name}/log#{ (count != 100) ? "/#{count}" : '' }#{ raw ? '.txt' : '' }#footer\">#{h(title)}</a>"
   end
 
   def log_downloads_link(name)
-    "<a target=\"_blank\" href=\"/#{h(name)}/log-downloads\/\">#{h(t('runit.services.log.downloads'))}&hellip;</a>"
+    "<a target=\"_blank\" href=\"/#{name}/log-downloads\/\">#{h(t('runit.services.log.downloads'))}&hellip;</a>"
   end
 
   def even_or_odd
@@ -112,3 +112,4 @@ module Helpers
     end.join(' ')
   end
 end
+

data/lib/runit-man/runner.rb

@@ -1,8 +1,9 @@
 require 'optparse'
 require 'runit-man/app'
 
-RunitMan.set :active_services_directory, '/etc/service'
-RunitMan.set :all_services_directory,    '/etc/sv'
+RunitMan.set :active_services_directory, RunitMan::DEFAULT_ACTIVE_SERVICES_DIR
+RunitMan.set :all_services_directory,    RunitMan::DEFAULT_ALL_SERVICES_DIR
+RunitMan.set :logger_option,             RunitMan::DEFAULT_LOGGER
 
 OptionParser.new { |op|
   op.banner = 'Usage: runit-man <options>'
@@ -20,6 +21,9 @@ OptionParser.new { |op|
   op.on('-v file_location', 'Enables view of specified file through runit-man') { |val| RunitMan.enable_view_of(val) }
   op.on('-u user:password', 'Requires user name with given password to auth') { |val| RunitMan.add_user(*(val.split(':', 2))) }
   op.separator 'Configuration options:'
+  op.on_tail('--rackup command_line', 'Change directory to config.ru location, set environment by options and execute specified command_line') do |command_line|
+    RunitMan.exec_rackup(command_line)
+  end
   op.on_tail('-r', '--register', 'Register as runit service') do
     RunitMan.register_as_runit_service
     exit

data/lib/runit-man/version.rb

@@ -1,4 +1,4 @@
 module RunitManVersion
-  VERSION = '2.2.9'.freeze
+  VERSION = '2.3.1'.freeze
 end
 

data/views/_service_action.haml

@@ -1,5 +1,5 @@
 - if enabled
-  %form.service-action{:action=>"#{h(name)}/#{h(action)}", :method=>"POST"}
-    %input{:type=>"submit", :value=>h(label)}/
+  %form.service-action{:action=>"#{name}/#{action}", :method=>"POST"}
+    %input{:type=>"submit", :value=>label}/
 - else
-  %input{:type=>"submit", :disabled=>"disabled", :value=>h(label), :onclick=>"return false;"}/
+  %input{:type=>"submit", :disabled=>"disabled", :value=>label, :onclick=>"return false;"}/

data/views/_service_info.haml

@@ -31,9 +31,10 @@
         = h(t('runit.services.table.values.files_to_view'))
         %span :
         - service_info.files_to_view.each do |f|
-          %a{:href=>"/view?file=#{h(f)}"}= h(f)
+          %a{:href=>"/view?file=#{f}"}= h(f)
       - unless service_info.urls_to_view.empty?
         = h(t('runit.services.table.values.urls_to_view'))
         %span :
         - service_info.urls_to_view.each do |url|
-          %a{:href=>h(url)}= h(url)
+          %a{:href=>url}= h(url)
+

data/views/_services.haml

@@ -17,5 +17,5 @@
 %ul
   - files_to_view.each do |f|
     %li
-      %a{:target=>"_blank", :href=>"/view?file=#{h(f)}"}= h(f)
+      %a{:target=>"_blank", :href=>"/view?file=#{f}"}= h(f)
 

data/views/view_file.haml

@@ -1,7 +1,7 @@
 - content_for :content do
   = t('runit.view_file.header', :file =>h(name), :host => h(host_name))
    | 
-  %a{:href=>"/view.txt?file=#{h(name)}"}= t('runit.view_file.raw')
+  %a{:href=>"/view.txt?file=#{name}"}= t('runit.view_file.raw')
   %pre= h(text)
 - content_for :footer do
   %p

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 1
   prerelease: 
   segments: 
   - 2
-  - 2
-  - 9
-  version: 2.2.9
+  - 3
+  - 1
+  version: 2.3.1
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -201,6 +201,7 @@ extra_rdoc_files: []
 files: 
 - bin/runit-man
 - lib/runit-man/app.rb
+- lib/runit-man/config.ru
 - lib/runit-man/helpers.rb
 - lib/runit-man/log_location_cache.rb
 - lib/runit-man/partials.rb