fluent-plugin-ignore-filter 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc87aa2fbf4628c74481551c55ee1f68d6db2a1a
-  data.tar.gz: 66aa9abb861ebe73bcd2b7470949d253e894b435
+  metadata.gz: 1bbfd7fb2ac3a1abd464c1d18ec06f13c6cb682b
+  data.tar.gz: 856b3d38299c4ba28044a657a4a26aa335009b39
 SHA512:
-  metadata.gz: 37ef2aab309ca8fcd3c6202c66b9cc856b9a154f766f5508a0c7af322ee4aa51be82e393d5c6483bd5b97b48dd8a6c9c9589f591be6ecb082623c683b9951f53
-  data.tar.gz: aaff43de97bbbd9866dd8036ea1b116ca04fae5a3aec2683caee4614ac204a5f84e1dfe5c9b6e25cd06200631cb8e65a48259e5a2bd8cce6269f5dd14b89c602
+  metadata.gz: b3e1743353a7c78b0ee36846858f4c20c9adca0d7eef909cd20650a44285d0b43167e1c4b47c40b952b9ba404b877192afc0975d232073c9aa125f66dbce4b1e
+  data.tar.gz: 37af28454a3e2910378f486b2aec257837822a906fd6fcf7287ae70bb051e18d6a4e8619c56a7d77765dbb69e7e3376f929ee1fb03ee414b922dfc1cee0a7c7d

data/.travis.yml

@@ -3,5 +3,3 @@ language: ruby
 rvm:
   - 2.3.0
   - 2.2
-  - 2.0
-  - 1.9.3

data/README.md

@@ -7,6 +7,14 @@
 [Fluentd](http://fluentd.org) filter plugin to ignore messages.
 
 
+## Requirements
+
+| fluent-plugin-ignore-filter | fluentd    | ruby   |
+|-----------------------------|------------|--------|
+| >= 2.0.0                    | >= v0.14.0 | >= 2.2 |
+| < 1.2.0                     | >= v0.12.0 | >= 1.9 |
+
+
 ## Installation
 
 ```bash

data/fluent-plugin-ignore-filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-ignore-filter"
-  spec.version       = "1.1.0"
+  spec.version       = "2.0.0"
   spec.authors       = ["Yuri Umezaki"]
   spec.email         = ["bungoume@gmail.com"]
   spec.homepage      = "https://github.com/bungoume/fluent-plugin-ignore-filter"
@@ -17,10 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "fluentd", ">= 0.12"
+  spec.add_runtime_dependency "fluentd", [">= 0.14.0", "< 2"]
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
-    spec.add_development_dependency "test-unit"
-  end
+  spec.add_development_dependency "test-unit"
 end

data/lib/fluent/plugin/filter_ignore.rb

@@ -1,4 +1,6 @@
-module Fluent
+require 'fluent/plugin/filter'
+
+module Fluent::Plugin
   class IgnoreFilter < Filter
     Fluent::Plugin.register_filter('ignore', self)
 
@@ -63,5 +65,5 @@ module Fluent
       end
       return true
     end
-  end if defined?(Filter) # Support only >= v0.12
+  end
 end

data/test/helper.rb

@@ -12,6 +12,7 @@ require 'test/unit'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'fluent/test'
+require 'fluent/test/driver/filter'
 unless ENV.has_key?('VERBOSE')
   nulllogger = Object.new
   nulllogger.instance_eval {|obj|

data/test/plugin/test_filter_ignore.rb

@@ -6,7 +6,7 @@ class IgnoreFilterTest < Test::Unit::TestCase
   end
 
   def create_driver(conf='')
-    Fluent::Test::FilterTestDriver.new(Fluent::IgnoreFilter).configure(conf, true)
+    Fluent::Test::Driver::Filter.new(Fluent::Plugin::IgnoreFilter).configure(conf)
   end
 
   def test_configure_default
@@ -23,28 +23,28 @@ class IgnoreFilterTest < Test::Unit::TestCase
   def test_emit
     d1 = create_driver(%[regexp1 level info])
 
-    d1.run do
-      d1.emit({'level'=>'info','ident'=>'kernel','server_name'=>'prod-web','message'=>'some info'})
-      d1.emit({'level'=>'warn','ident'=>'kernel','server_name'=>'prod-web','message'=>'failed to do something'})
+    d1.run(default_tag: 'test') do
+      d1.feed({'level'=>'info','ident'=>'kernel','server_name'=>'prod-web','message'=>'some info'})
+      d1.feed({'level'=>'warn','ident'=>'kernel','server_name'=>'prod-web','message'=>'failed to do something'})
     end
 
-    emits = d1.emits
+    filtered = d1.filtered
 
-    assert_equal(1, emits.length)
-    assert_equal('warn', emits[0][2]['level'])
+    assert_equal(1, filtered.length)
+    assert_equal('warn', filtered[0][1]['level'])
   end
 
   def test_emit_removebyident
     d1 = create_driver(%[regexp1 ident kernel])
 
-    d1.run do
-      d1.emit({'level'=>'info','ident'=>'kernel'})
-      d1.emit({'level'=>'warn','ident'=>'kernel'})
+    d1.run(default_tag: 'test') do
+      d1.feed({'level'=>'info','ident'=>'kernel'})
+      d1.feed({'level'=>'warn','ident'=>'kernel'})
     end
 
-    emits = d1.emits
+    filtered = d1.filtered
 
-    assert_equal(0, emits.length)
+    assert_equal(0, filtered.length)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-ignore-filter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Yuri Umezaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2017-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.14.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement