runit-man 2.0.9 → 2.1.0

data/lib/runit-man/app.rb

@@ -2,7 +2,7 @@
 
 require 'fileutils'
 require 'yajl'
-require 'erubis'
+require 'haml'
 require 'i18n'
 require 'sinatra/base'
 require 'runit-man/helpers'
@@ -98,9 +98,9 @@ class RunitMan < Sinatra::Base
   end
 
   get '/' do
-    @scripts = [ 'jquery-1.5.2.min' ]
+    @scripts = %w[ jquery-1.5.2.min runit-man ]
     @title = host_name
-    erubis :index
+    haml :index
   end
 
   get '/services' do
@@ -129,13 +129,13 @@ class RunitMan < Sinatra::Base
     data = log_of_service(name, count)
     return not_found if data.nil?
     @title = t('runit.services.log.title', :name => h(name), :host => h(host_name), :count => h(count), :log_location => h(data[:log_location]))
-    erubis :log, :locals => data
+    haml :log, :locals => data
   end
 
   get %r[^/([^/]+)/log\-downloads/?$] do |name|
     srv = ServiceInfo[name]
     return not_found if srv.nil? || !srv.logged?
-    erubis :log_downloads, :locals => {
+    haml :log_downloads, :locals => {
       :name  => name,
       :files => srv.log_files
     }
@@ -174,7 +174,7 @@ class RunitMan < Sinatra::Base
     end
     @title = t('runit.view_file.title', :file => h(data[:name]), :host => h(host_name))
     content_type CONTENT_TYPES[:html], :charset => 'utf-8'
-    erubis :view_file, :locals => data 
+    haml :view_file, :locals => data 
   end
 
   get '/view.txt' do
@@ -189,7 +189,8 @@ class RunitMan < Sinatra::Base
   def log_action(name, text)
     env  = request.env
     addr = env.include?('X_REAL_IP') ? env['X_REAL_IP'] : env['REMOTE_ADDR']
-    puts "#{addr} - - [#{Time.now}] \"Do #{text} on #{name}\""
+    $stdout.puts "#{addr} - - [#{Time.now}] \"Do #{text} on #{name}\""
+    $stdout.flush
   end
 
   post '/:name/signal/:signal' do |name, signal|

data/lib/runit-man/helpers.rb

@@ -16,7 +16,6 @@ module Helpers
     Utils.host_name
   end
 
-
   def t(*args)
     Utils.t(*args)
   end

data/lib/runit-man/partials.rb

@@ -8,11 +8,11 @@ module Sinatra::Partials
     options.merge!(:layout => false)
     if collection = options.delete(:collection) then
       collection.inject([]) do |buffer, member|
-        buffer << erubis(:"#{template}", options.merge(:layout =>
+        buffer << haml(:"#{template}", options.merge(:layout =>
         false, :locals => {template_array[-1].to_sym => member}))
       end.join("\n")
     else
-      erubis(:"#{template}", options)
+      haml(:"#{template}", options)
     end
   end
 end

data/lib/runit-man/version.rb

@@ -1,4 +1,4 @@
 module RunitManVersion
-  VERSION = '2.0.9'.freeze
+  VERSION = '2.1.0'.freeze
 end
 

data/views/_service_action.haml

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

data/views/_service_info.haml

@@ -0,0 +1,39 @@
+- need_second_row = !service_info.files_to_view.empty? || !service_info.urls_to_view.empty?
+%tr{:class=> even_or_odd ? 'even' : 'odd'}
+  %td{:rowspan=> need_second_row ? 2 : 1}= h(service_info.pid)
+  %th{:scope=>"row"}= h(service_info.name)
+  %td= service_info.started_at ? service_info.started_at.utc : ''
+  %td= service_info.uptime ? ('%.2f' % service_info.uptime) : ''
+  %td= stat_subst(service_info.stat)
+  %td
+    - if service_info.active?
+      = service_action service_info.name, :restart, t('runit.services.table.actions.restart'), !service_info.down?
+      = service_action service_info.name, :down, t('runit.services.table.actions.stop'), !service_info.down?
+      = service_action service_info.name, :up, t('runit.services.table.actions.start'), service_info.down?
+      - unless service_info.down?
+        - service_info.allowed_signals.each do |signal|
+          = service_signal service_info.name, signal, t("runit.services.table.signals.#{signal}")
+      - if service_info.switchable?
+        = service_action service_info.name, :switch_down, t('runit.services.table.actions.switch_down')
+    - else
+      - if service_info.switchable?
+        = service_action service_info.name, :switch_up, t('runit.services.table.actions.switch_up')
+  %td
+    - if service_info.logged?
+      = log_link(service_info.name, :hint => t('runit.services.table.values.log_hint', :name => service_info.name), :blank => true, :title => service_info.log_file_location)
+      = log_downloads_link(service_info.name)
+    - else
+      = t('runit.services.table.values.log_absent')
+- if need_second_row
+  %tr
+    %td{:colspan=>6}
+      - unless service_info.files_to_view.empty?
+        = 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)
+      - 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)

data/views/_service_signal.haml

@@ -0,0 +1,2 @@
+%form.service-signal{:action=>"#{h(name)}/signal/#{h(signal)}", :method=>"POST"}
+  %input{:type=>"submit", :value=> h(label)}/

data/views/_services.haml

@@ -0,0 +1,21 @@
+%table
+  %caption= h(t('runit.services.table.caption'))
+  %thead
+    %tr
+      %th= h(t('runit.services.table.headers.pid'))
+      %th= h(t('runit.services.table.headers.name'))
+      %th= h(t('runit.services.table.headers.started_at'))
+      %th= h(t('runit.services.table.headers.uptime'))
+      %th= h(t('runit.services.table.headers.stat'))
+      %th= h(t('runit.services.table.headers.actions'))
+      %th= h(t('runit.services.table.headers.log_file'))
+  %tfoot
+    %tr
+      %td{:colspan=>7}= t('runit.services.table.footer', :time => h(Time.now.utc))
+  %tbody
+    = partial(:service_info, :collection => service_infos)
+%ul
+  - files_to_view.each do |f|
+    %li
+      %a{:target=>"_blank", :href=>"/view?file=#{h(f)}"}= h(f)
+

data/views/index.haml

@@ -0,0 +1,7 @@
+- content_for :content do
+  #error{:class=>"error"}
+    = h(t('runit.error', :err => '<span id="url"></span>'))
+    %span .
+  #services= t('runit.loading')
+- content_for :footer do
+  %p= t('runit.footer', :sec => '<span id="service-refresh-interval">?</span>')

data/views/layout.haml

@@ -0,0 +1,23 @@
+!!! 5
+%html
+  %head
+    %title= h(t('runit.title', :p1 => @title, :p2 => t('runit.label')))
+    %link{:href=>"/css/tripoli.simple.css", :type=>"text/css", :rel=>"stylesheet"}/
+    %link{:href=>"/css/tripoli.visual.css", :type=>"text/css", :rel=>"stylesheet"}/
+    %link{:href=>"/css/tripoli.type.css", :type=>"text/css", :rel=>"stylesheet"}/
+    /[if IE]
+      %link{:href=>"/css/tripoli.simple.ie.css", :type=>"text/css", :rel=>"stylesheet"}/
+    %link{:href=>"/css/runit-man.css", :type=>"text/css", :rel=>"stylesheet"}/
+  %body
+    #container
+      #header
+        .content
+          %strong= h(t('runit.header', :p1 => host_name, :p2 => t('runit.label')))
+
+      .content= yield_content :content
+
+      #footer
+        .content= yield_content :footer
+    - @scripts.each do |name|
+      %script{:type=>"text/javascript", :src=>"/js/#{h(name)}.js"}
+

data/views/log.haml

@@ -0,0 +1,12 @@
+- content_for :content do
+  = t('runit.services.log.header', :name => h(name), :host => h(host_name), :count => h(count), :log_location => h(log_location))
+   | 
+  = log_link(name, :count => count, :title => t('runit.services.log.raw'), :raw => true)
+  %p
+    = t('runit.services.log.counts', :count => [100, 250, 500, 1000, 5000].map { |n| log_link(name, :count => n, :title => n) }.join(' '))
+    = log_downloads_link(name)
+  %pre= h(text)
+- content_for :footer do
+  %p
+    = t('runit.services.log.updated', :time => I18n.l(Time.now.utc))
+    %a{:href=>"javascript:;", :rel=>"nofollow", :onclick=>"window.location.reload()"}= t('runit.services.log.reload')

data/views/log_downloads.haml

@@ -0,0 +1,23 @@
+- content_for :content do
+  %h2= h(name)
+  %h3= h(t('runit.services.log.downloads'))
+  %table
+    %thead
+      %tr
+        %th= h(t('runit.services.log.modified'))
+        %th= h(t('runit.services.log.file_name'))
+        %th= h(t('runit.services.log.file_size'))
+        %th
+    %tfoot
+      %tr
+        %td{:colspan=>4}= h(t('runit.services.log.about_utc'))
+    %tbody
+      - files.each do |f|
+        %tr{:class=> even_or_odd ? 'even' : 'odd'}
+          %td= h(I18n.l(f[:modified]))
+          %td= h(f[:label])
+          %td{:title=>h(f[:size])}= h(human_bytes(f[:size]))
+          %td
+            %a{:href=>"/#{h(name)}/log-download/#{h(f[:name])}"}
+              = h(t('runit.services.log.download'))
+              …

data/views/view_file.haml

@@ -0,0 +1,10 @@
+- 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')
+  %pre= h(text)
+- content_for :footer do
+  %p
+    = t('runit.view_file.updated', :time => Time.now.utc)
+    %a{:href=>"javascript:;", :rel=>"nofollow", :onclick=>"window.location.reload()"}= t('runit.view_file.reload')
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 11
   prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 9
-  version: 2.0.9
+  version: 2.1.0
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 +04:00
+date: 2011-04-29 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,19 +35,18 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: erubis
+  name: haml
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
-        - 2
         - 3
-        - 1
-        version: 2.3.1
+        - 0
+        version: "3.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -201,15 +200,15 @@ files:
 - public/css/tripoli.visual.css
 - public/js/jquery-1.5.2.min.js
 - public/js/runit-man.js
-- views/_service_action.erubis
-- views/_service_info.erubis
-- views/_service_signal.erubis
-- views/_services.erubis
-- views/index.erubis
-- views/layout.erubis
-- views/log.erubis
-- views/log_downloads.erubis
-- views/view_file.erubis
+- views/_service_action.haml
+- views/_service_info.haml
+- views/_service_signal.haml
+- views/_services.haml
+- views/index.haml
+- views/layout.haml
+- views/log.haml
+- views/log_downloads.haml
+- views/view_file.haml
 - i18n/en.yml
 - i18n/ru.yml
 - sv/log/run.erb

data/views/_service_action.erubis

@@ -1,7 +0,0 @@
-<% if enabled %>
-  <form class="service-action" action="<%= h(name) %>/<%= h(action) %>" method="POST">
-    <input type="submit" value="<%= h(label) %>" />
-  </form>
-<% else %>
-  <input type="submit" disabled="disabled" value="<%= h(label) %>" onclick="return false;" />
-<% end %>

data/views/_service_info.erubis

@@ -1,52 +0,0 @@
-<%
-need_second_row = !service_info.files_to_view.empty? || !service_info.urls_to_view.empty?
-%>
-<tr class="<%= even_or_odd ? 'even' : 'odd' %>">
-  <td<%= need_second_row ? ' rowspan="2"' : '' %>><%= h(service_info.pid) %></td>
-  <th scope="row"><%= h(service_info.name) %></th>
-  <td><%= service_info.started_at ? service_info.started_at.utc : '' %></td>
-  <td><%= service_info.uptime ? ('%.2f' % service_info.uptime) : '' %></td>
-  <td><%= stat_subst(service_info.stat) %></td>
-  <td>
-    <% if service_info.active? %>
-      <%= service_action service_info.name, :restart, t('runit.services.table.actions.restart'), !service_info.down? %>
-      <%= service_action service_info.name, :down, t('runit.services.table.actions.stop'), !service_info.down? %>
-      <%= service_action service_info.name, :up, t('runit.services.table.actions.start'), service_info.down? %>
-      <% unless service_info.down? %>
-        <% service_info.allowed_signals.each do |signal| %>
-          <%= service_signal service_info.name, signal, t("runit.services.table.signals.#{signal}") %>
-        <% end %>
-      <% end %>
-      <% if service_info.switchable? %>
-        <%= service_action service_info.name, :switch_down, t('runit.services.table.actions.switch_down') %>
-      <% end %>
-    <% else %>
-      <% if service_info.switchable? %>
-        <%= service_action service_info.name, :switch_up, t('runit.services.table.actions.switch_up') %>
-      <% end %>
-    <% end %>
-  </td>
-  <td>
-    <% if service_info.logged? %>
-      <%= log_link(service_info.name, :hint => t('runit.services.table.values.log_hint', :name => service_info.name), :blank => true, :title => service_info.log_file_location) %>
-      <%= log_downloads_link(service_info.name) %>
-    <% else %>
-      <%= t('runit.services.table.values.log_absent') %>
-    <% end %>
-  </td>
-</tr>
-<% if need_second_row %><tr><td colspan="6">
-<% 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 %>

data/views/_service_signal.erubis

@@ -1,3 +0,0 @@
-<form class="service-signal" action="<%= h(name) %>/signal/<%= h(signal) %>" method="POST">
-    <input type="submit" value="<%= h(label) %>" />
-</form>

data/views/_services.erubis

@@ -1,27 +0,0 @@
-<table>
-    <caption><%= h(t('runit.services.table.caption')) %></caption>
-    <thead>
-        <tr>
-            <th><%= h(t('runit.services.table.headers.pid')) %></th>
-            <th><%= h(t('runit.services.table.headers.name')) %></th>
-            <th><%= h(t('runit.services.table.headers.started_at')) %></th>
-            <th><%= h(t('runit.services.table.headers.uptime')) %></th>
-            <th><%= h(t('runit.services.table.headers.stat')) %></th>
-            <th><%= h(t('runit.services.table.headers.actions')) %></th>
-            <th><%= h(t('runit.services.table.headers.log_file')) %></th>
-        </tr>
-    </thead>
-    <tfoot>
-        <tr>
-            <td colspan="7"><%= t('runit.services.table.footer', :time => h(Time.now.utc)) %></td>
-        </tr>
-    </tfoot>
-    <tbody>
-        <%= 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/index.erubis

@@ -1,14 +0,0 @@
-<% content_for :content do %>
-    <div id="error" class="error">
-        <%= h(t('runit.error', :err => '<span id="url"></span>')) %>.
-    </div>
-    <div id="services">
-        <%= t('runit.loading') %>
-    </div>
-<% end %>
-<% content_for :footer do %>
-    <p>
-        <%= t('runit.footer', :sec => '<span id="service-refresh-interval">?</span>') %>
-    </p>
-<% end %>
-<% @scripts << 'runit-man' %>

data/views/layout.erubis

@@ -1,35 +0,0 @@
-<html>
-  <head>
-    <title><%= h(t('runit.title', :p1 => @title, :p2 => t('runit.label'))) %></title>
-    <link href="/css/tripoli.simple.css" type="text/css" rel="stylesheet" />
-    <link href="/css/tripoli.visual.css" type="text/css" rel="stylesheet" />
-    <link href="/css/tripoli.type.css" type="text/css" rel="stylesheet" />
-    <!--[if IE]><link href="/css/tripoli.simple.ie.css" type="text/css" rel="stylesheet" /><![endif]-->
-    <link href="/css/runit-man.css" type="text/css" rel="stylesheet" />
-  </head>
-  <body>
-    <div id="container">
-      <div id="header">
-        <div class="content">
-          <strong><%= h(t('runit.header', :p1 => host_name, :p2 => t('runit.label'))) %></strong>
-        </div>
-      </div>
-
-      <div class="content">
-        <%= yield_content :content %>
-      </div>
-
-<% if content_for?(:footer) %>
-      <div id="footer">
-        <div class="content">
-          <%= yield_content :footer %>
-        </div>
-      </div>
-<% end %>
-
-    </div>
-  <% @scripts.each do |name| %>
-    <script type="text/javascript" src="/js/<%= h(name) %>.js"></script>
-  <% end %>
-  </body>
-</html>

data/views/log.erubis

@@ -1,15 +0,0 @@
-<% content_for :content do %>
-    <%= t('runit.services.log.header', :name => h(name), :host => h(host_name), :count => h(count), :log_location => h(log_location)) %> | <%= log_link(name, :count => count, :title => t('runit.services.log.raw'), :raw => true) %>
-
-    <p>
-      <%= t('runit.services.log.counts', :count => [100, 250, 500, 1000, 5000].map { |n| log_link(name, :count => n, :title => n) }.join(' ')) %>
-      <%= log_downloads_link(name) %>
-
-    </p>
-    <pre><%= h(text) %></pre>
-<% end %>
-<% content_for :footer do %>
-    <p>
-        <%= t('runit.services.log.updated', :time => I18n.l(Time.now.utc)) %> <a href="javascript:;" rel="nofollow" onclick="window.location.reload()"><%= t('runit.services.log.reload') %></a>
-    </p>
-<% end %>

data/views/log_downloads.erubis

@@ -1,28 +0,0 @@
-<% content_for :content do %>
-<h2><%= h(name) %></h2>
-<h3><%= h(t('runit.services.log.downloads')) %></h3>
-<table>
-  <thead>
-    <tr>
-      <th><%= h(t('runit.services.log.modified')) %></th>
-      <th><%= h(t('runit.services.log.file_name')) %></th>
-      <th><%= h(t('runit.services.log.file_size')) %></th>
-      <th></th>
-     </tr>
-  </thead>
-  <tfoot>
-    <tr>
-      <td colspan="4"><%= h(t('runit.services.log.about_utc')) %></td>
-    </tr>
-  </tfoot>
-  <tbody>
-  <% files.each do |f| %>
-    <tr class="<%= even_or_odd ? 'even' : 'odd' %>">
-      <td><%= h(I18n.l(f[:modified])) %></td>
-      <td><%= h(f[:label]) %></td>
-      <td title="<%= h(f[:size]) %>"><%= h(human_bytes(f[:size])) %></td>
-      <td><a href="/<%= h(name) %>/log-download/<%= h(f[:name]) %>"><%= h(t('runit.services.log.download')) %>&hellip;</a></td>
-    </tr>
-  <% end %>
-  </tbody>
-<% end %>

data/views/view_file.erubis

@@ -1,10 +0,0 @@
-<% 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>
-
-    <pre><%= h(text) %></pre>
-<% end %>
-<% content_for :footer do %>
-    <p>
-        <%= t('runit.view_file.updated', :time => Time.now.utc) %> <a href="javascript:;" rel="nofollow" onclick="window.location.reload()"><%= t('runit.view_file.reload') %></a>
-    </p>
-<% end %>