runit-man 1.4.9 → 1.5.0

data/i18n/en.yml

@@ -35,3 +35,10 @@ runit:
       updated: "Page updated at %1"
       reload: Reload
       raw: Raw
+  view_file:
+    raw: Raw
+    title: 'File %1 on %2'
+    header: 'View %1 file on %2'
+    updated: "Page updated at %1"
+    reload: Reload
+

data/i18n/ru.yml

@@ -37,3 +37,9 @@ runit:
       updated: "Страница обновлена %1"
       reload: Обновить страницу
       raw: Текст
+  view_file:
+    raw: Текст
+    title: 'Файл %1 на %2'
+    header: 'Просмотр файла %1 на %2'
+    updated: "Страница обновлена %1"
+    reload: Обновить страницу

data/lib/runit-man/app.rb

@@ -81,6 +81,29 @@ class RunitMan < Sinatra::Base
     data[:text]
   end
 
+  get '/view' do
+    if !request.GET.has_key?('file')
+      return not_found
+    end
+    f = request.GET['file']
+    return not_found unless files_to_view.include?(f)
+    @scripts = []
+    @title = t.runit.view_file.title(h(f), h(host_name))
+    erb :view_file, :locals => {
+      :name  => f,
+      :text  => IO.read(f)
+    }
+  end
+
+  get '/view.txt' do
+    if !request.GET.has_key?('file')
+      return not_found
+    end
+    f = request.GET['file']
+    return not_found unless files_to_view.include?(f)
+    IO.read(f)
+  end
+
   def log_action(name, text)
     env  = request.env
     addr = env.include?('X_REAL_IP') ? env['X_REAL_IP'] : env['REMOTE_ADDR']
@@ -112,6 +135,14 @@ class RunitMan < Sinatra::Base
       do_cmd("ln -sf #{File.join(RunitMan.all_services_directory, 'runit-man')} #{File.join(RunitMan.active_services_directory, 'runit-man')}")
     end
 
+    def enable_view_of(file_location)
+      files_to_view << File.expand_path(file_location, '/')
+    end
+
+    def files_to_view
+      @files_to_view ||= []
+    end
+
   private
     def do_cmd(command)
       system(command) or raise "Cannot execute #{command}"

data/lib/runit-man/helpers.rb

@@ -26,6 +26,14 @@ module Helpers
     ServiceInfo.all
   end
 
+  def files_to_view
+    RunitMan.files_to_view.map do |f|
+      File.symlink?(f) ? File.expand_path(File.readlink(f), File.dirname(f)) : f
+    end.select do |f|
+      File.readable?(f)
+    end.uniq.sort
+  end
+
   def service_action(name, action, label)
     partial :service_action, :locals => {
       :name   => name,

data/lib/runit-man/runner.rb

@@ -5,11 +5,16 @@ RunitMan.set :active_services_directory, '/etc/service'
 RunitMan.set :all_services_directory,    '/etc/sv'
 
 OptionParser.new { |op|
+  op.separator 'Server options:'
   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 } if RunitMan.respond_to?(:bind)
+  op.separator 'runit options:'
   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.separator 'View options:'
+  op.on('-v file_location', 'Enables view of specified file through runit-man') { |val| RunitMan.enable_view_of(val) }
+  op.separator 'Configuration options:'
   op.on_tail('-r', '--register', 'Register as runit service') do
     RunitMan.register_as_runit_service
     exit

data/views/_services.erb

@@ -18,3 +18,8 @@
         <%= partial(:service_info, :collection => service_infos) %>
     </tbody>
 </table>
+<ul>
+<% files_to_view.each do |f| %>
+  <li><a target="_blank" href="/view?file=<%= h(f) %>"><%= h(f) %></a></li>
+<% end %>
+</ul>

data/views/view_file.erb

@@ -0,0 +1,10 @@
+<% content_for :content do %>
+    <%= t.runit.view_file.header(h(name), h(host_name)) %> | <a href="/view.txt?file=<% h(name) %>"><%= t.runit.view_file.raw %></a>
+
+    <pre><%= h(text) %></pre>
+<% end %>
+<% content_for :footer do %>
+    <p>
+        <%= t.runit.view_file.updated(Time.now.utc) %> <a href="javascript:;" rel="nofollow" onclick="window.location.reload()"><%= t.view_file.reload %></a>
+    </p>
+<% end %>

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 4
-  - 9
-  version: 1.4.9
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 +04:00
+date: 2010-04-09 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -147,6 +147,7 @@ files:
 - public/css/tripoli.type.css
 - views/log.erb
 - views/layout.erb
+- views/view_file.erb
 - views/index.erb
 - views/_services.erb
 - views/_service_action.erb