runit-man 2.3.9 → 2.3.11

data/Gemfile.lock

@@ -1,24 +1,26 @@
 PATH
   remote: .
   specs:
-    runit-man (2.3.9)
-      file-tail (>= 1.0.5)
-      haml (>= 3.0)
-      i18n (>= 0.5.0)
-      sinatra (>= 1.1)
-      sinatra-content-for2 (>= 0.2.4)
-      yajl-ruby (>= 0.7.8)
+    runit-man (2.3.11)
+      file-tail (~> 1.0.7)
+      haml (~> 3.0)
+      i18n (~> 0.5)
+      sinatra (~> 1.3)
+      sinatra-content-for2 (~> 0.2.4)
+      yajl-ruby (~> 1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    file-tail (1.0.6)
-      spruz (~> 0.2)
-    haml (3.1.2)
+    file-tail (1.0.7)
+      tins (~> 0.3)
+    haml (3.1.3)
     i18n (0.6.0)
     kgio (2.6.0)
     rack (1.3.2)
+    rack-protection (1.1.4)
+      rack
     rack-test (0.6.1)
       rack (>= 1.0)
     rainbows (4.3.1)
@@ -32,24 +34,25 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     sendfile (1.1.0)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
+    sinatra (1.3.0)
+      rack (~> 1.3)
+      rack-protection (~> 1.1)
+      tilt (~> 1.3)
     sinatra-content-for2 (0.2.4)
       sinatra
-    spruz (0.2.13)
     tilt (1.3.3)
+    tins (0.3.2)
     unicorn (4.1.1)
       kgio (~> 2.4)
       rack
       raindrops (~> 0.6)
-    yajl-ruby (0.8.3)
+    yajl-ruby (1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.10)
+  bundler (~> 1.0.10)
   rack (>= 1.3.0)
   rack-test
   rainbows

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Akzhan Abdulin
+Copyright (c) 2010-2011 Akzhan Abdulin and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/runit-man/app.rb

@@ -14,39 +14,7 @@ if RUBY_VERSION >= '1.9'
   Encoding.default_internal = "utf-8"
 end
 
-RunitManVersion.sendfile = (Sinatra::VERSION >= '1.3.0')
-
-if Sinatra::VERSION < '1.3.0' && Rack.release >= '1.3'
-  # Monkey patch old Sinatra to use Rack::File to serve files.
-  RunitManVersion.sendfile = true
-
-  Sinatra::Helpers.class_eval do
-    # Got from Sinatra 1.3.0 sources
-    def send_file(path, opts={})
-      if opts[:type] or not response['Content-Type']
-        content_type opts[:type] || File.extname(path), :default => 'application/octet-stream'
-      end
-
-      if opts[:disposition] == 'attachment' || opts[:filename]
-        attachment opts[:filename] || path
-      elsif opts[:disposition] == 'inline'
-        response['Content-Disposition'] = 'inline'
-      end
-
-      last_modified opts[:last_modified] if opts[:last_modified]
-
-      file      = Rack::File.new nil
-      file.path = path
-      result    = file.serving env
-      result[1].each { |k,v| headers[k] ||= v }
-      halt result[0], result[2]
-    rescue Errno::ENOENT
-      not_found
-    end
-  end
-end
-
-RunitManVersion.sendfile &&= !!File.instance_methods.detect { |m| "#{m}" == 'trysendfile' }
+RunitManVersion.sendfile = !!File.instance_methods.detect { |m| "#{m}" == 'trysendfile' }
 
 class RunitMan < Sinatra::Base
   VERSION       = RunitManVersion::VERSION

data/lib/runit-man/{log_location_cache.rb → log_location_cache/base.rb}

@@ -1,10 +1,11 @@
 require 'monitor'
 
-class LogLocationCache
+module LogLocationCache; end
+
+class LogLocationCache::Base
   TIME_LIMIT = 600
 
-  def initialize(logger)
-    @logger = logger
+  def initialize
     @monitor = Monitor.new
     clear
   end
@@ -21,12 +22,19 @@ class LogLocationCache
     pids[pid][:value]
   end
 
-private
+protected
   attr_accessor :query_counter
   attr_accessor :pids
-  attr_reader   :logger
   attr_reader   :monitor
 
+  def not_implemented
+    raise NotImplementedError.new
+  end
+
+  def get_pid_location(lpid)
+    not_implemented
+  end
+
   def clear
     monitor.synchronize do
       self.query_counter = 0
@@ -52,15 +60,6 @@ private
     self
   end
 
-  def get_pid_location(lpid)
-    folder = log_folder(lpid)
-    return nil if folder.nil?
-    return File.join(folder, 'current') if logger == RunitMan::DEFAULT_LOGGER
-    loc = File.join(folder, Time.now.strftime('%Y-%m-%d'), "#{log_folder_base_name(lpid)}.log")
-    loc = "#{loc}.gz" unless File.exists?(loc)
-    loc
-  end
-
   def log_command(lpid)
     return nil if lpid.nil?
     ps_output = `ps -o args -p #{lpid} 2>&1`.split("\n")
@@ -70,11 +69,7 @@ private
   end
 
   def logger_name
-    (logger =~ /^([^\:]+)\:/) ? $1 : logger
-  end
-
-  def log_base_folder
-    (logger =~ /^[^\:]+\:([^\:]+)/) ? $1 : nil
+    not_implemented
   end
 
   def log_command_args(lpid)
@@ -89,32 +84,15 @@ private
     args = log_command_args(lpid)
     return nil if args.nil?
     result = args.first
-    # we should remove : from the end of the line for logger installations.
-    result = $1 if  result =~ /^(.+)\:$/
     result
   end
 
   def log_folder(lpid)
-    folder = log_folder_base_name(lpid)
-    (log_base_folder.nil? || folder.nil?) ? folder : File.join(log_base_folder, folder)
-  end
-
-  def log_priority(lpid)
-    args = log_command_args(lpid)
-    args.nil? ? logger_priority : args.last
+    not_implemented
   end
 
   def set_pid_log_location(pid, log_location)
-    remove_old_values
-    if log_location =~ /current$/
-      monitor.synchronize do
-        pids[pid.to_i] = {
-          :value => log_location,
-          :time  => Time.now
-        }
-      end
-    end
-    self
+    not_implemented
   end
 end
 

data/lib/runit-man/log_location_cache/logger.rb

@@ -0,0 +1,51 @@
+require 'monitor'
+
+class LogLocationCache::Logger < LogLocationCache::Base
+  def initialize(logger)
+    @logger = logger
+  end
+
+protected
+  attr_reader   :logger
+
+  def get_pid_location(lpid)
+    folder = log_folder(lpid)
+    return nil if folder.nil?
+    loc = File.join(folder, Time.now.strftime('%Y-%m-%d'), "#{log_folder_base_name(lpid)}.log")
+    unless File.exists?(loc)
+      loc = "#{loc}.gz"
+      loc = nil unless File.exists?(loc)
+    end
+    loc
+  end
+
+  def logger_name
+    (logger =~ /^([^\:]+)\:/) ? $1 : logger
+  end
+
+  def log_base_folder
+    (logger =~ /^[^\:]+\:([^\:]+)/) ? $1 : nil
+  end
+
+  def log_folder(lpid)
+    folder = log_folder_base_name(lpid)
+    (log_base_folder.nil? || folder.nil?) ? folder : File.join(log_base_folder, folder)
+  end
+
+  def log_priority(lpid)
+    args = log_command_args(lpid)
+    args.nil? ? logger_priority : args.last
+  end
+
+  def set_pid_log_location(pid, log_location)
+    remove_old_values
+  end
+
+  def log_folder_base_name(lpid)
+    result = super(lpid)
+    # we should remove : from the end of the line for logger installations.
+    result = $1 if  result =~ /^(.+)\:$/
+    result
+  end
+end
+

data/lib/runit-man/log_location_cache/svlogd.rb

@@ -0,0 +1,31 @@
+require 'monitor'
+
+class LogLocationCache::Svlogd < LogLocationCache::Base
+
+protected
+  def get_pid_location(lpid)
+    folder = log_folder(lpid)
+    return nil if folder.nil?
+    File.join(folder, 'current')
+  end
+
+  def logger_name
+    'svlogd'
+  end
+
+  def log_folder(lpid)
+    log_folder_base_name(lpid)
+  end
+
+  def set_pid_log_location(pid, log_location)
+    remove_old_values
+    monitor.synchronize do
+      pids[pid.to_i] = {
+        :value => log_location,
+        :time  => Time.now
+      }
+    end
+    self
+  end
+end
+

data/lib/runit-man/service_info.rb

@@ -1,4 +1,6 @@
-require 'runit-man/log_location_cache'
+require 'runit-man/log_location_cache/base'
+require 'runit-man/log_location_cache/svlogd'
+require 'runit-man/log_location_cache/logger'
 require 'runit-man/service_status'
 require 'runit-man/utils'
 
@@ -286,7 +288,11 @@ private
     end
 
     def log_location_cache
-      @log_location_cache ||= LogLocationCache.new(RunitMan.runit_logger)
+      @log_location_cache ||= case RunitMan.runit_logger
+      when RunitMan::DEFAULT_LOGGER; LogLocationCache::Svlogd.new
+      when /^logger\b/; LogLocationCache::Logger.new(RunitMan.runit_logger)
+      else raise NotImplementedError.new
+      end
     end
 
     def real_data_from_file(file_name)

data/lib/runit-man/version.rb

@@ -1,5 +1,5 @@
 module RunitManVersion
-  VERSION = '2.3.9'.freeze
+  VERSION = '2.3.11'.freeze
 
   class << self
     attr_accessor :sendfile

data/runit-man.gemspec

@@ -18,18 +18,18 @@ spec = Gem::Specification.new do |s|
   ]
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.add_dependency 'yajl-ruby', '>= 0.7.8'
-  s.add_dependency 'haml', '>= 3.0'
-  s.add_dependency 'sinatra', '>= 1.1'
-  s.add_dependency 'sinatra-content-for2', '>= 0.2.4'
-  s.add_dependency 'i18n', '>= 0.5.0'
-  s.add_dependency 'file-tail', '>= 1.0.5'
+  s.add_dependency 'yajl-ruby', '~> 1.0'
+  s.add_dependency 'haml', '~> 3.0'
+  s.add_dependency 'sinatra', '~> 1.3'
+  s.add_dependency 'sinatra-content-for2', '~> 0.2.4'
+  s.add_dependency 'i18n', '~> 0.5'
+  s.add_dependency 'file-tail', '~> 1.0.7'
   s.add_development_dependency 'rake', '!= 0.9.0'
   s.add_development_dependency 'rspec-core'
   s.add_development_dependency 'rspec-expectations'
   s.add_development_dependency 'rr'
   s.add_development_dependency 'rack-test'
-  s.add_development_dependency 'bundler', '>= 1.0.10'
+  s.add_development_dependency 'bundler', '~> 1.0.10'
   s.description = File.open(File.join(File.dirname(__FILE__), 'DESCRIPTION')).read
 end
 

metadata

@@ -1,220 +1,165 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: runit-man
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 2.3.11
   prerelease: 
-  segments: 
-  - 2
-  - 3
-  - 9
-  version: 2.3.9
 platform: ruby
-authors: 
+authors:
 - Akzhan Abdulin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-05 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: yajl-ruby
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160178740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 7
-        - 8
-        version: 0.7.8
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2160178740
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &2160197540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2160197540
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &2160196860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  name: sinatra-content-for2
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2160196860
+- !ruby/object:Gem::Dependency
+  name: sinatra-content-for2
+  requirement: &2160195880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 2
-        - 4
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.2.4
   type: :runtime
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2160195880
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2160194640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :runtime
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  name: file-tail
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2160194640
+- !ruby/object:Gem::Dependency
+  name: file-tail
+  requirement: &2160193240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 0
-        - 5
-        version: 1.0.5
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.7
   type: :runtime
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2160193240
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2160210160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "!="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
+    requirements:
+    - - ! '!='
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  name: rspec-core
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2160210160
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: &2160208960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec-expectations
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2160208960
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: &2160207680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2160207680
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &2160206580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2160206580
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &2160205720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *2160205720
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2160204500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.0.10
   type: :development
-  requirement: *id012
-description: |
-  Simple runit (http://smarden.org/runit/) web management tool with i18n.
-  
+  prerelease: false
+  version_requirements: *2160204500
+description: ! 'Simple runit (http://smarden.org/runit/) web management tool with
+  i18n.
+
+
   Server will run by runit-man script.
-  
+
+
   More information available at https://github.com/Undev/runit-man
 
+'
 email: akzhan.abdulin@gmail.com
-executables: 
+executables:
 - runit-man
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - .gitignore
 - CHANGELOG.markdown
 - DESCRIPTION
@@ -231,7 +176,9 @@ files:
 - 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/log_location_cache/base.rb
+- lib/runit-man/log_location_cache/logger.rb
+- lib/runit-man/log_location_cache/svlogd.rb
 - lib/runit-man/partials.rb
 - lib/runit-man/rainbows.conf
 - lib/runit-man/runner.rb
@@ -265,40 +212,37 @@ files:
 - views/log.haml
 - views/log_downloads.haml
 - views/view_file.haml
-has_rdoc: true
 homepage: https://github.com/Undev/runit-man
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4317472699217292697
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-requirements: 
+      hash: 4317472699217292697
+requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Runit web management tool.
-test_files: 
+test_files:
 - spec/functional/runit-man_spec.rb
 - spec/spec_helper.rb