runit-man 1.5.4 → 1.6.0

data/lib/runit-man/app.rb

@@ -87,7 +87,7 @@ class RunitMan < Sinatra::Base
       return not_found
     end
     f = request.GET['file']
-    return not_found unless files_to_view.include?(f)
+    return not_found unless all_files_to_view.include?(f)
     @scripts = []
     @title = t.runit.view_file.title(h(f), h(host_name))
     erb :view_file, :locals => {

data/lib/runit-man/helpers.rb

@@ -34,6 +34,12 @@ module Helpers
     end.uniq.sort
   end
 
+  def all_files_to_view
+    (files_to_view + service_infos.map do |service|
+      service.files_to_view
+    end.flatten).uniq.sort
+  end
+
   def service_action(name, action, label)
     partial :service_action, :locals => {
       :name   => name,

data/lib/runit-man/service_info.rb

@@ -77,6 +77,31 @@ class ServiceInfo
     File.open(File.join(supervise_folder, 'control'), 'w') { |f| f.print signal.to_s }
   end
 
+  def files_to_view
+    return [] unless File.directory?(files_to_view_folder)
+    Dir.entries(files_to_view_folder).select do |name|
+      File.symlink?(File.join(files_to_view_folder, name))
+    end.map do |name|
+      File.expand_path(
+        File.readlink(File.join(files_to_view_folder, name)),
+        files_to_view_folder
+      )
+    end.select do |file_path|
+      File.file?(file_path)
+    end 
+  end
+
+  def urls_to_view
+    return [] unless File.directory?(urls_to_view_folder)
+    Dir.entries(urls_to_view_folder).select do |name|
+      name =~ /\.url$/ && File.file?(File.join(urls_to_view_folder, name))
+    end.map do |name|
+      ServiceInfo.data_from_file(File.join(urls_to_view_folder, name))
+    end.select do |url|
+      !url.nil?
+    end
+  end
+
 private
   def inactive_service_folder
     File.join(RunitMan.all_services_directory, name)
@@ -86,6 +111,14 @@ private
     File.join(RunitMan.active_services_directory, name)
   end
 
+  def files_to_view_folder
+    File.join(active_service_folder, 'runit-man', 'files-to-view')
+  end
+
+  def urls_to_view_folder
+    File.join(active_service_folder, 'runit-man', 'urls-to-view')
+  end
+
   def supervise_folder
     File.join(active_service_folder, 'supervise')
   end

data/views/_service_info.erb

@@ -1,5 +1,8 @@
+<%
+need_second_row = !service_info.files_to_view.empty? || !service_info.urls_to_view.empty?
+%>
 <tr class="<%= even_or_odd ? 'even' : 'odd' %>">
-  <td><%= h(service_info.pid) %></td>
+  <td<%= need_second_row ? ' rowspan="2"' : '' %>><%= h(service_info.pid) %></td>
   <th scope="row"><%= h(service_info.name) %></th>
   <td><%= stat_subst(service_info.stat) %></td>
   <td>
@@ -27,3 +30,18 @@
     <% end %>
   </td>
 </tr>
+<% if need_second_row %><tr><td colspan="4">
+<% unless service_info.files_to_view.empty? %>
+  <%= h(t.runit.services.table.values.files_to_view) %>:
+  <% service_info.files_to_view.each do |f| %>
+    <a href="/view?file=<%= h(f) %>"><%= h(f) %></a>
+  <% end %>
+<% end %>
+<% unless service_info.urls_to_view.empty? %>
+  <%= h(t.runit.services.table.values.urls_to_view) %>:
+  <% service_info.urls_to_view.each do |url| %>
+    <a href="<%= h(url) %>"><%= h(url) %></a>
+  <% end %>
+<% end %>
+
+</td></tr><% end %>

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 5
-  - 4
-  version: 1.5.4
+  - 6
+  - 0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 +04:00
+date: 2010-04-14 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency