multilog-collector 0.3.3 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f0f3afcb52dbe9008da2c3ac49786c461f35faca
+  data.tar.gz: b9e85acf63e9efb8492ea4d4402654a577092153
+SHA512:
+  metadata.gz: 060ddd65d805617ca46a691073081e3be13d72d47c2fa0a2fa07ff92d07d1f3c7d5cccb31140323aea53fd37db536c8150b46c6c66fc10f38ea93fc808966211
+  data.tar.gz: e58f073f1d71767dca5b246e87fbd869c64333463949091304efc702daa64aff17119aea8d6758dc223e521e48bb997efe1ccb3babb57d9e18f66e27c46267c7

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/.gitignore

@@ -0,0 +1,43 @@
+Gemfile.lock
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+#
+# For TextMate
+#*.tmproj
+#tmtags
+#
+# For emacs:
+#*~
+#\#*
+#.\#*
+#
+# For vim:
+#*.swp

data/.travis.yml

@@ -0,0 +1,11 @@
+bundler_args: --without development
+language: ruby
+matrix:
+  allow_failures:
+    - rvm: 1.8.7
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+script: bundle exec rake spec

data/Gemfile

@@ -1,13 +1,9 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+source "https://rubygems.org"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+gem 'rake'
+
+group :test, :development do
+  gem 'rspec'
+  gem 'simplecov'
+  gem 'coveralls', require: false
 end

data/{README.rdoc → README.md}

@@ -1,19 +1,24 @@
-= multilog-collector
+# multilog-collector
 
-This is a log collector for multilog of daemontools services.
+[![Build Status](https://travis-ci.org/tumf/multilog-collector.svg?branch=master)](https://travis-ci.org/tumf/multilog-collector)
+[![Coverage Status](https://coveralls.io/repos/tumf/multilog-collector/badge.png)](https://coveralls.io/r/tumf/multilog-collector)
 
-== Install
+A log collector for multilog of daemontools services.
 
- sudo gem install multilog-collector
+## Install
 
-== Usage
+    gem install multilog-collector
 
+## Usage
+
+```
  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
+## 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
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
@@ -23,9 +28,7 @@ This is a log collector for multilog of daemontools services.
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
-
-Copyright (c) 2011 Yoshihiro TAKAHARA. See LICENSE.txt for
-further details.
+## Copyright
 
+Copyright (c) 2011 Yoshihiro TAKAHARA. See LICENSE.txt for further details.
 

data/Rakefile

@@ -1,53 +1,7 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "multilog-collector"
-  gem.homepage = "http://github.com/tumf/multilog-collector"
-  gem.license = "MIT"
-  gem.summary = %Q{log collector for multilog.}
-  gem.description = %Q{This is a log collector for multilog of daemontools services.}
-  gem.email = "y.takahara@gmail.com"
-  gem.authors = ["Yoshihiro TAKAHARA"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
+task :default => :spec
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "multilog-collector #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+desc "Run all specs in spec directory"
+RSpec::Core::RakeTask.new(:spec)

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

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

@@ -14,13 +14,20 @@ module Djb
           @service_dir = dir
         end
 
-        def collect
+        def glob_pattern
+          @service_dir + "/*/log/main/current"
+        end
+
+        def logs
           all = Logs.new
-          glob_pattern = @service_dir + "/*/log/main/current"
           Dir.glob(glob_pattern).each do |file| 
             all += Logs.new.load(file,@lines)
           end
-          all.sort! do |a,b|
+          all
+        end
+
+        def collect
+          all = logs.sort! do |a,b|
             a.time <=> b.time
           end
           # all[all.length - @lines..-1]

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

@@ -20,10 +20,6 @@ module Djb
           $1 if /\/([^\/]+)\/log\/main\/current/ =~ @file
         end
 
-        def to_s
-          join("\n",self)
-        end
-
       end
     end
   end

data/multilog-collector.gemspec

@@ -1,70 +1,22 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-Gem::Specification.new do |s|
-  s.name = %q{multilog-collector}
-  s.version = "0.3.3"
+Gem::Specification.new do |spec|
+  spec.name          = "multilog-collector"
+  spec.version       = File.open("VERSION").read
+  spec.authors       = ["Yoshihiro TAKAHARA"]
+  spec.email         = ["y.takahara@gmail.com"]
+  spec.description   = %q{A log collector for multilog of daemontools services}
+  spec.summary       = %q{It is software which collects daemontools service logs.}
+  spec.homepage      = "https://github.com/tumf/multilog-collector"
+  spec.license       = "MIT"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Yoshihiro TAKAHARA"]
-  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"]
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "bin/multilog-collector",
-    "lib/djb/daemontools/multilog/collector.rb",
-    "lib/djb/daemontools/multilog/log.rb",
-    "lib/djb/daemontools/multilog/logs.rb",
-    "lib/djb/tai64n.rb",
-    "lib/multilog-collector.rb",
-    "multilog-collector.gemspec",
-    "test/helper.rb",
-    "test/test_multilog-collector.rb"
-  ]
-  s.homepage = %q{http://github.com/tumf/multilog-collector}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{log collector for multilog.}
-  s.test_files = [
-    "test/helper.rb",
-    "test/test_multilog-collector.rb"
-  ]
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  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
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
 end
-

data/spec/data/1

@@ -0,0 +1,8 @@
+@400000004d81ed7004a0883c stats 9666 726613 1 0
+@400000004d81ed7004a08c24 sent 9647 28
+@400000004d81ed7004a2babc query 9667 7f000001:a866:d66a 28 github.com.
+@400000004d81ed7004a2c28c cached 28 github.com.
+@400000004d81ed7004a2c674 sent 9667 28
+@400000004d81ed7004a435a4 query 9668 7f000001:e9cd:0b87 1 github.com.
+@400000004d81ed7004a4398c cached 1 github.com.
+@400000004d81ed7004a43d74 sent 9668 44

data/spec/data/2

@@ -0,0 +1,5 @@
+@400000004d81ed6f3aaada2c nodata ca04eb3b 360 28 github.com.
+@400000004d81ed6f3aaade14 stats 9664 726579 2 0
+@400000004d81ed6f3aaae1fc sent 9648 28
+@400000004d81ed6f3aaae5e4 query 9665 7f000001:85a4:5843 28 github.com.
+@400000004d81ed6f3aaae9cc cached 28 github.com.

data/spec/data/3

@@ -0,0 +1,5 @@
+@400000004d81ed6f3aaaedb4 sent 9665 28
+@400000004d81ed6f3aac83f4 query 9666 7f000001:cc55:a8d8 1 github.com.
+@400000004d81ed6f3aac87dc cached 1 github.com.
+@400000004d81ed6f3aac8bc4 sent 9666 44
+@400000004d81ed7004a08454 nodata d04c3c64 360 28 github.com.

data/spec/djb/daemontools/multilog/collector_spec.rb

@@ -0,0 +1,42 @@
+$:.unshift(File.join(File.dirname(__FILE__), "..","..","..",".."))
+require 'helper'
+require 'time'
+require 'djb/daemontools/multilog/collector'
+
+describe Djb::Daemontools::Multilog::Collector do
+  before do
+    @collector = Djb::Daemontools::Multilog::Collector.new
+  end
+
+  describe "#collect" do
+    context "when it load from data directory" do
+      it "returns logs" do
+        @collector.stub(:glob_pattern).and_return("spec/data/*")
+        expect(@collector.collect.length).to eq 18
+      end
+    end
+    
+    context "when it has no logs" do
+      it "returns logs" do
+        @collector.stub(:glob_pattern).and_return("spec/data2/*")
+        logs = @collector.collect
+        expect(logs.length).to eq 0
+      end
+    end
+
+    context "when it set lines" do
+      it "returns 10" do
+        @collector.stub(:glob_pattern).and_return("spec/data/*")
+        @collector.lines = 10
+        expect(@collector.collect.length).to eq 10
+      end
+    end
+  end
+  
+  describe "#glob_pattern" do
+    it "returns default value" do
+      expect(@collector.glob_pattern).to eq "/service/*/log/main/current"
+    end
+  end
+  
+end

data/spec/djb/daemontools/multilog/log_spec.rb

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+$:.unshift(File.join(File.dirname(__FILE__), "..","..","..",".."))
+require 'helper'
+require 'time'
+require 'djb/daemontools/multilog/log'
+
+describe Djb::Daemontools::Multilog::Log do
+  describe "#to_s" do
+    it "returns log as string" do
+      @log = Djb::Daemontools::Multilog::Log.new("@400000004d81ed7004a435a4 query 9668 7f000001:e9cd:0b87 1 github.com.","test-service")
+      expect(@log.to_s).to match /\[test-service\] query 9668 7f000001:e9cd:0b87 1 github.com\./
+    end
+  end
+end

data/spec/djb/tai64n_spec.rb

@@ -0,0 +1,12 @@
+$:.unshift(File.join(File.dirname(__FILE__), ".."))
+require 'helper'
+require 'time'
+require 'djb/tai64n.rb'
+
+describe Djb::Tai64n do
+  describe ".to_local" do
+    it "returns 2011-03-17 20:01:46.923072500 UTC" do
+      expect(Djb::Tai64n::to_local("@400000004d81ea243704f7f4")).to eq Time.parse("2011-03-17 11:01:46.923072500 UTC")
+    end
+  end
+end

data/spec/helper.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+$TESTING=true
+
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
+
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require 'rspec'
+RSpec.configure do |config|
+end

metadata

@@ -1,97 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: multilog-collector
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 3
-  version: 0.3.3
+version: !ruby/object:Gem::Version
+  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Yoshihiro TAKAHARA
 autorequire: 
 bindir: bin
 cert_chain: []
-
-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: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
+date: 2014-06-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
   prerelease: false
-  name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  name: rcov
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-description: This is a log collector for multilog of daemontools services.
-email: y.takahara@gmail.com
-executables: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A log collector for multilog of daemontools services
+email:
+- y.takahara@gmail.com
+executables:
 - multilog-collector
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
+- .document
+- .gitignore
+- .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - bin/multilog-collector
@@ -101,42 +61,42 @@ files:
 - lib/djb/tai64n.rb
 - lib/multilog-collector.rb
 - multilog-collector.gemspec
-- test/helper.rb
-- test/test_multilog-collector.rb
-has_rdoc: true
-homepage: http://github.com/tumf/multilog-collector
-licenses: 
+- spec/data/1
+- spec/data/2
+- spec/data/3
+- spec/djb/daemontools/multilog/collector_spec.rb
+- spec/djb/daemontools/multilog/log_spec.rb
+- spec/djb/tai64n_spec.rb
+- spec/helper.rb
+homepage: https://github.com/tumf/multilog-collector
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: log collector for multilog.
-test_files: 
-- test/helper.rb
-- test/test_multilog-collector.rb
+specification_version: 4
+summary: It is software which collects daemontools service logs.
+test_files:
+- spec/data/1
+- spec/data/2
+- spec/data/3
+- spec/djb/daemontools/multilog/collector_spec.rb
+- spec/djb/daemontools/multilog/log_spec.rb
+- spec/djb/tai64n_spec.rb
+- spec/helper.rb

data/Gemfile.lock

@@ -1,20 +0,0 @@
-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/test/helper.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'multilog-collector'
-
-class Test::Unit::TestCase
-end

data/test/test_multilog-collector.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestMultilogCollector < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end