fluent-plugin-dstat 0.2.5 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 874c87a821fe33c500caf3a277cf2108983c1b2f
-  data.tar.gz: d4f9d613b08268b7b24b5e5d70a78dd091ae4217
+  metadata.gz: 9dbc37ebe465f4c0ae08e6c2f54af6c9e5717d0e
+  data.tar.gz: 1c24595a4c2d5680dca8523fdbe01e798f2e5508
 SHA512:
-  metadata.gz: bf5cf53459c1d7ffa86064b9acaee372554087fe6d83283828d99c591c0cefb694d18e63a0a501bb5d5214613f2e0d060e0b18e302c78ae8c3c77a703b720727
-  data.tar.gz: 0ffc82d3d8c3a0e26021af5324c10d34ac20a1f956d72a22a58e8745e1c1a6eb0416f0210ef637cf0dc890b4b20d7fdb426a078a7ffd7a7d74691d547d8e54d4
+  metadata.gz: 1f56f8c4b7317d97d267c5bbe111f210eddf8b2756a715fd5e0f6edd7c4148c082ec74e82bc2d249c1b54b32d4b9c6db1b94e1257bab1d7259d595386356e285
+  data.tar.gz: 55a7d544584cc6d0c07f7e7ef286185da7adc3fb8aa1bdc1f9deef0e0f626fa36128e00e11b3c7bc8abb206b477f2951a478ad97097040104f1479bad284c5f8

data/Gemfile

@@ -1,16 +1,4 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-# 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"
-  gem "jeweler", "~> 2.0.1"
-end
+gemspec
 
-gem 'fluent-mixin-rewrite-tag-name'
-gem "fluentd", "~> 0.10.7"
-gem "rdoc"

data/Rakefile

@@ -1,43 +1 @@
-# encoding: utf-8
-
-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 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "fluent-plugin-dstat"
-  gem.homepage = "http://github.com/shun0102/fluent-plugin-dstat"
-  gem.summary = "Dstat Input plugin for Fluent event collector"
-  gem.email = "shun0102@gmail.com"
-  gem.authors = ["Shunsuke Mikami"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "fluent-plugin-dstat #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require "bundler/gem_tasks"

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.3.1

data/fluent-plugin-dstat.gemspec

@@ -1,17 +1,14 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: fluent-plugin-dstat 0.2.5 ruby lib
+# stub: fluent-plugin-dstat 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "fluent-plugin-dstat"
-  s.version = "0.2.5"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Shunsuke Mikami"]
-  s.date = "2014-02-12"
+  s.date = "2015-08-15"
   s.email = "shun0102@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -31,7 +28,7 @@ Gem::Specification.new do |s|
     "test/plugin/test_in_dstat.rb"
   ]
   s.homepage = "http://github.com/shun0102/fluent-plugin-dstat"
-  s.rubygems_version = "2.2.0"
+  s.rubygems_version = "2.4.5"
   s.summary = "Dstat Input plugin for Fluent event collector"
 
   if s.respond_to? :specification_version then
@@ -39,26 +36,23 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<fluent-mixin-rewrite-tag-name>, [">= 0"])
-      s.add_runtime_dependency(%q<fluentd>, ["~> 0.10.7"])
+      s.add_runtime_dependency(%q<fluentd>, [">= 0.10.7", "< 2"])
       s.add_runtime_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<test-unit>, [">= 3.0.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
     else
-      s.add_dependency(%q<fluent-mixin-rewrite-tag-name>, [">= 0"])
-      s.add_dependency(%q<fluentd>, ["~> 0.10.7"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<fluent-mixin-rewrite-tag-name>, [">= 0"])
+      s.add_runtime_dependency(%q<fluentd>, [">= 0.10.7", "< 2"])
+      s.add_runtime_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<test-unit>, [">= 3.0.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     end
   else
-    s.add_dependency(%q<fluent-mixin-rewrite-tag-name>, [">= 0"])
-    s.add_dependency(%q<fluentd>, ["~> 0.10.7"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_runtime_dependency(%q<fluent-mixin-rewrite-tag-name>, [">= 0"])
+    s.add_runtime_dependency(%q<fluentd>, [">= 0.10.7", "< 2"])
+    s.add_runtime_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<test-unit>, [">= 3.0.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
   end
 end
 

data/lib/fluent/plugin/in_dstat.rb

@@ -104,6 +104,8 @@ module Fluent
           @first_keys.each_with_index do |key, index|
             if key.nil? || key == ""
               @first_keys[index] = pre_key
+            else
+              @first_keys[index] = @first_keys[index].gsub(/\s/, '_')
             end
             pre_key = @first_keys[index]
           end
@@ -127,7 +129,7 @@ module Fluent
           }
           emit_tag = @tag.dup
           filter_record(emit_tag, Engine.now, record)
-          Engine.emit(emit_tag, Engine.now, record)
+          router.emit(emit_tag, Engine.now, record)
         end
 
         if (@line_number % @max_lines) == (@max_lines - 1)
@@ -156,6 +158,8 @@ module Fluent
       end
 
       def on_change(prev, cur)
+        return if cur.size < @pos
+
         buffer = @io.read(cur.size - @pos)
         @pos = cur.size
         lines = []

data/test/helper.rb

@@ -8,7 +8,6 @@ rescue Bundler::BundlerError => e
   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__))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dstat
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.1
 platform: ruby
 authors:
 - Shunsuke Mikami
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluent-mixin-rewrite-tag-name
@@ -28,16 +28,22 @@ dependencies:
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +59,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 description: 
 email: shun0102@gmail.com
 executables: []
@@ -132,8 +124,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Dstat Input plugin for Fluent event collector
 test_files: []
+has_rdoc: