multilog-collector 0.3.1 → 0.3.3

data/Gemfile.lock

@@ -0,0 +1,20 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    git (1.2.5)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
+    rcov (0.9.9)
+    shoulda (2.11.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  jeweler (~> 1.5.2)
+  rcov
+  shoulda

data/README.rdoc

@@ -11,7 +11,8 @@ This is a log collector for multilog of daemontools services.
  Usage: multilog-collector [options]
         --help                       show this message
     -d, --directory=DIR              service directory default: /service
-    
+    -l, --lines=N                    lines to collect default: 100
+
 == Contributing to multilog-collector
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.3

data/bin/multilog-collector

@@ -1,2 +1,17 @@
 #!/usr/bin/env ruby
-require __FILE__ + '.rb'
+require 'optparse'
+
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+require 'djb/daemontools/multilog/collector'
+
+directory = "/service"
+collector = Djb::Daemontools::Multilog::Collector.new
+
+opt = OptionParser.new
+opt.on('--help', 'show this message') { puts opt; exit }
+opt.on('-d DIR','--directory=DIR','service directory default: /service'){ |v| collector.directory = v }
+opt.on('-l N','--lines=N','lines to collect default: 100'){ |v| collector.lines = v.to_i }
+opt.parse!(ARGV)
+
+puts collector.collect
+

data/lib/djb/daemontools/multilog/collector.rb

@@ -6,7 +6,8 @@ module Djb
     module Multilog
       class Collector
         attr_accessor :service_dir,:lines
-        alias directory= service_dir=
+        alias :directory :service_dir
+        alias :directory= :service_dir=
 
         def initialize(dir = "/service")
           @lines = 100
@@ -23,7 +24,8 @@ module Djb
             a.time <=> b.time
           end
           # all[all.length - @lines..-1]
-          all[-@lines..-1]
+          lines = [@lines,all.length].min
+          all[-lines..-1]
         end
       end
       

data/lib/djb/daemontools/multilog/log.rb

@@ -5,9 +5,11 @@ module Djb
   module Daemontools
     module Multilog
       class Log 
+        attr_accessor :time
 
         def initialize(line,service)
           @line = line
+          @time = to_time
           @service = service
         end
 
@@ -15,7 +17,7 @@ module Djb
           return $1 if /^(@[a-z0-9]+) / =~ @line
         end
 
-        def time
+        def to_time
           Tai64n::to_local(tai64n)
         end
 

data/lib/djb/daemontools/multilog/logs.rb

@@ -10,7 +10,7 @@ module Djb
           @file = file
           open(file) do |f|
             while line = f.gets
-              self << Log.new(line,service)
+              self << Log.new(line,service) rescue {}
             end
           end
           self

data/lib/djb/tai64n.rb

@@ -5,7 +5,7 @@ module Djb
     # Thanks.
     # http://d.hatena.ne.jp/unageanu/20091207
     def self.to_local tai
-      raise "illegal format" unless tai =~ /\@40000000([\da-f]{8})([\da-f]{8})/
+      raise "illegal format: #{tai}" unless tai =~ /\@40000000([\da-f]{8})([\da-f]{8})/
       Time.at($1.hex-10, $2.hex/1000.0)
     end
   end

data/multilog-collector.gemspec

@@ -5,26 +5,27 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multilog-collector}
-  s.version = "0.3.1"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoshihiro TAKAHARA"]
-  s.date = %q{2011-01-16}
+  s.date = %q{2011-01-27}
+  s.default_executable = %q{multilog-collector}
   s.description = %q{This is a log collector for multilog of daemontools services.}
   s.email = %q{y.takahara@gmail.com}
-  s.executables = ["multilog-collector.rb", "multilog-collector"]
+  s.executables = ["multilog-collector"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
   ]
   s.files = [
     "Gemfile",
+    "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
     "VERSION",
     "bin/multilog-collector",
-    "bin/multilog-collector.rb",
     "lib/djb/daemontools/multilog/collector.rb",
     "lib/djb/daemontools/multilog/log.rb",
     "lib/djb/daemontools/multilog/logs.rb",
@@ -37,7 +38,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/tumf/multilog-collector}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.1}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{log collector for multilog.}
   s.test_files = [
     "test/helper.rb",
@@ -45,6 +46,7 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multilog-collector
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  hash: 21
+  prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Yoshihiro TAKAHARA
@@ -15,10 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 +09:00
-default_executable: 
+date: 2011-01-27 00:00:00 +09:00
+default_executable: multilog-collector
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: shoulda
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,10 +32,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id001
-  prerelease: false
-  name: shoulda
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: bundler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,10 +48,10 @@ dependencies:
         - 0
         version: 1.0.0
   requirement: *id002
-  prerelease: false
-  name: bundler
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: jeweler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,10 +64,10 @@ dependencies:
         - 2
         version: 1.5.2
   requirement: *id003
-  prerelease: false
-  name: jeweler
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rcov
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,13 +78,9 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
-  prerelease: false
-  name: rcov
-  type: :development
 description: This is a log collector for multilog of daemontools services.
 email: y.takahara@gmail.com
 executables: 
-- multilog-collector.rb
 - multilog-collector
 extensions: []
 
@@ -90,12 +89,12 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
 - bin/multilog-collector
-- bin/multilog-collector.rb
 - lib/djb/daemontools/multilog/collector.rb
 - lib/djb/daemontools/multilog/log.rb
 - lib/djb/daemontools/multilog/logs.rb
@@ -134,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: log collector for multilog.

data/bin/multilog-collector.rb

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-require 'optparse'
-
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-require 'djb/daemontools/multilog/collector'
-
-directory = "/service"
-collector = Djb::Daemontools::Multilog::Collector.new
-
-opt = OptionParser.new
-opt.on('--help', 'show this message') { puts opt; exit }
-opt.on('-d DIR','--directory=DIR','service directory default: /service'){ |v| collector.directory = v }
-opt.on('-l N','--lines=N','lines to collect default: 100'){ |v| collector.lines = v.to_i }
-opt.parse!(ARGV)
-
-puts collector.collect
-