runit-man 1.10.1 → 1.10.2

data/lib/runit-man/app.rb

@@ -97,7 +97,7 @@ class RunitMan < Sinatra::Base
     return not_found if srv.nil? || !srv.logged?
     f = srv.log_files.detect { |f| f[:name] == file_name }
     return not_found unless f
-    send_file(srv.log_file_path(file_name), :type => 'text/plain', :disposition => 'attachment', :filename => "#{name}-#{file_name}.txt", :last_modified => f[:modified].httpdate)
+    send_file(srv.log_file_path(file_name), :type => 'text/plain', :disposition => 'attachment', :filename => f[:label], :last_modified => f[:modified].httpdate)
   end
 
 

data/lib/runit-man/service_info.rb

@@ -2,7 +2,9 @@ require 'runit-man/log_location_cache'
 require 'runit-man/service_status'
 
 class ServiceInfo
-  SPECIAL_LOG_FILES = %w(lock config).freeze
+  SPECIAL_LOG_FILES = %w(lock config state newstate).freeze
+
+  include R18n::Helpers
 
   attr_reader :name
 
@@ -106,6 +108,11 @@ class ServiceInfo
     File.expand_path(file_name, dir_name)
   end
 
+  # Localizes time and replaces some localized characters with more file system friendly characters
+  def fl(time)
+    l(time).gsub(/[\:\s]/, '-').gsub(/[\\\/]/, '.')
+  end
+
   def log_files
     r = []
     dir_name = File.dirname(log_file_location)
@@ -113,10 +120,14 @@ class ServiceInfo
       next if ServiceInfo.itself_or_parent?(name)
       next if SPECIAL_LOG_FILES.include?(name)
       full_name = File.expand_path(name, dir_name)
+      stats = File.stat(full_name)
+      label = "#{self.name}-#{fl(stats.atime)}-#{fl(stats.mtime)}.log"
       r << {
-        :name => name,
-        :size => File.size(full_name),
-        :modified => File.mtime(full_name)
+        :name     => name,
+        :label    => label,
+        :size     => stats.size,
+        :created  => stats.ctime,
+        :modified => stats.mtime
       }
     end
     if r.length >= 2

data/lib/runit-man/version.rb

@@ -1,4 +1,4 @@
 module RunitManVersion
-  VERSION = '1.10.1'.freeze
+  VERSION = '1.10.2'.freeze
 end
 

data/views/log_downloads.erubis

@@ -15,7 +15,7 @@
   <% files.each do |f| %>
     <tr class="<%= even_or_odd ? 'even' : 'odd' %>">
       <td title="<%= h(l(f[:modified], :full)) %>"><%= h(l(f[:modified], :human)) %></td>
-      <td><%= h(f[:name]) %></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>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: false
+  hash: 59
+  prerelease: 
   segments: 
   - 1
   - 10
-  - 1
-  version: 1.10.1
+  - 2
+  version: 1.10.2
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +03:00
+date: 2011-02-15 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Runit web management tool.