fluentd 0.12.0.pre.2 → 0.12.0.pre.3

data/test/test_input.rb

@@ -0,0 +1,30 @@
+require_relative 'helper'
+require 'fluent/input'
+
+class FluentInputTest < ::Test::Unit::TestCase
+  include Fluent
+
+  def setup
+    Fluent::Test.setup
+  end
+
+  def create_driver(conf = '')
+    Fluent::Test::InputTestDriver.new(Fluent::Input).configure(conf, true)
+  end
+
+  def test_configure
+    d = create_driver
+    assert_equal Engine.root_agent.event_router, d.instance.router
+
+    assert_raise(ArgumentError) {
+      create_driver('@label @unknown')
+    }
+
+    Engine.root_agent.add_label('@known')
+    d = nil
+    assert_nothing_raised { 
+      d = create_driver('@label @known')
+    }
+    assert d.instance.router
+  end
+end

data/test/test_match.rb

@@ -1,88 +1,104 @@
-require 'helper'
+require_relative 'helper'
 require 'fluent/match'
 
 class MatchTest < Test::Unit::TestCase
   include Fluent
 
   def test_simple
-    assert_match('a', 'a')
-    assert_match('a.b', 'a.b')
-    assert_not_match('a', 'b')
-    assert_not_match('a.b', 'aab')
+    assert_glob_match('a', 'a')
+    assert_glob_match('a.b', 'a.b')
+    assert_glob_not_match('a', 'b')
+    assert_glob_not_match('a.b', 'aab')
   end
 
   def test_wildcard
-    assert_match('a*', 'a')
-    assert_match('a*', 'ab')
-    assert_match('a*', 'abc')
-
-    assert_match('*a', 'a')
-    assert_match('*a', 'ba')
-    assert_match('*a', 'cba')
-
-    assert_match('*a*', 'a')
-    assert_match('*a*', 'ba')
-    assert_match('*a*', 'ac')
-    assert_match('*a*', 'bac')
-
-    assert_not_match('a*', 'a.b')
-    assert_not_match('a*', 'ab.c')
-    assert_not_match('a*', 'ba')
-    assert_not_match('*a', 'ab')
-
-    assert_match('a.*', 'a.b')
-    assert_match('a.*', 'a.c')
-    assert_not_match('a.*', 'ab')
-
-    assert_match('a.*.c', 'a.b.c')
-    assert_match('a.*.c', 'a.c.c')
-    assert_not_match('a.*.c', 'a.c')
+    assert_glob_match('a*', 'a')
+    assert_glob_match('a*', 'ab')
+    assert_glob_match('a*', 'abc')
+
+    assert_glob_match('*a', 'a')
+    assert_glob_match('*a', 'ba')
+    assert_glob_match('*a', 'cba')
+
+    assert_glob_match('*a*', 'a')
+    assert_glob_match('*a*', 'ba')
+    assert_glob_match('*a*', 'ac')
+    assert_glob_match('*a*', 'bac')
+
+    assert_glob_not_match('a*', 'a.b')
+    assert_glob_not_match('a*', 'ab.c')
+    assert_glob_not_match('a*', 'ba')
+    assert_glob_not_match('*a', 'ab')
+
+    assert_glob_match('a.*', 'a.b')
+    assert_glob_match('a.*', 'a.c')
+    assert_glob_not_match('a.*', 'ab')
+
+    assert_glob_match('a.*.c', 'a.b.c')
+    assert_glob_match('a.*.c', 'a.c.c')
+    assert_glob_not_match('a.*.c', 'a.c')
   end
 
   def test_recursive_wildcard
-    assert_match('a.**', 'a')
-    assert_not_match('a.**', 'ab')
-    assert_not_match('a.**', 'abc')
-    assert_match('a.**', 'a.b')
-    assert_not_match('a.**', 'ab.c')
-    assert_not_match('a.**', 'ab.d.e')
-
-    assert_match('a**', 'a')
-    assert_match('a**', 'ab')
-    assert_match('a**', 'abc')
-    assert_match('a**', 'a.b')
-    assert_match('a**', 'ab.c')
-    assert_match('a**', 'ab.d.e')
-
-    assert_match('**.a', 'a')
-    assert_not_match('**.a', 'ba')
-    assert_not_match('**.a', 'c.ba')
-    assert_match('**.a', 'b.a')
-    assert_match('**.a', 'cb.a')
-    assert_match('**.a', 'd.e.a')
-
-    assert_match('**a', 'a')
-    assert_match('**a', 'ba')
-    assert_match('**a', 'c.ba')
-    assert_match('**a', 'b.a')
-    assert_match('**a', 'cb.a')
-    assert_match('**a', 'd.e.a')
+    assert_glob_match('a.**', 'a')
+    assert_glob_not_match('a.**', 'ab')
+    assert_glob_not_match('a.**', 'abc')
+    assert_glob_match('a.**', 'a.b')
+    assert_glob_not_match('a.**', 'ab.c')
+    assert_glob_not_match('a.**', 'ab.d.e')
+
+    assert_glob_match('a**', 'a')
+    assert_glob_match('a**', 'ab')
+    assert_glob_match('a**', 'abc')
+    assert_glob_match('a**', 'a.b')
+    assert_glob_match('a**', 'ab.c')
+    assert_glob_match('a**', 'ab.d.e')
+
+    assert_glob_match('**.a', 'a')
+    assert_glob_not_match('**.a', 'ba')
+    assert_glob_not_match('**.a', 'c.ba')
+    assert_glob_match('**.a', 'b.a')
+    assert_glob_match('**.a', 'cb.a')
+    assert_glob_match('**.a', 'd.e.a')
+
+    assert_glob_match('**a', 'a')
+    assert_glob_match('**a', 'ba')
+    assert_glob_match('**a', 'c.ba')
+    assert_glob_match('**a', 'b.a')
+    assert_glob_match('**a', 'cb.a')
+    assert_glob_match('**a', 'd.e.a')
   end
 
   def test_or
-    assert_match('a.{b,c}', 'a.b')
-    assert_match('a.{b,c}', 'a.c')
-    assert_not_match('a.{b,c}', 'a.d')
-
-    assert_match('a.{b,c}.**', 'a.b')
-    assert_match('a.{b,c}.**', 'a.c')
-    assert_not_match('a.{b,c}.**', 'a.d')
-    assert_not_match('a.{b,c}.**', 'a.cd')
-
-    assert_match('a.{b.**,c}', 'a.b')
-    assert_match('a.{b.**,c}', 'a.b.c')
-    assert_match('a.{b.**,c}', 'a.c')
-    assert_not_match('a.{b.**,c}', 'a.c.d')
+    assert_glob_match('a.{b,c}', 'a.b')
+    assert_glob_match('a.{b,c}', 'a.c')
+    assert_glob_not_match('a.{b,c}', 'a.d')
+
+    assert_glob_match('a.{b,c}.**', 'a.b')
+    assert_glob_match('a.{b,c}.**', 'a.c')
+    assert_glob_not_match('a.{b,c}.**', 'a.d')
+    assert_glob_not_match('a.{b,c}.**', 'a.cd')
+
+    assert_glob_match('a.{b.**,c}', 'a.b')
+    assert_glob_match('a.{b.**,c}', 'a.b.c')
+    assert_glob_match('a.{b.**,c}', 'a.c')
+    assert_glob_not_match('a.{b.**,c}', 'a.c.d')
+  end
+
+  def test_multi_pattern_or
+    assert_or_match('a.b a.c', 'a.b')
+    assert_or_match('a.b a.c', 'a.c')
+    assert_or_not_match('a.b a.c', 'a.d')
+
+    assert_or_match('a.b.** a.c.**', 'a.b')
+    assert_or_match('a.b.** a.c.**', 'a.c')
+    assert_or_not_match('a.b.** a.c.**', 'a.d')
+    assert_or_not_match('a.b.** a.c.**', 'a.cd')
+
+    assert_or_match('a.b.** a.c', 'a.b')
+    assert_or_match('a.b.** a.c', 'a.b.c')
+    assert_or_match('a.b.** a.c', 'a.c')
+    assert_or_not_match('a.b.** a.c', 'a.c.d')
   end
 
   #def test_character_class
@@ -101,14 +117,21 @@ class MatchTest < Test::Unit::TestCase
   #  assert_not_match('[a-b0-9]', 'c')
   #end
 
-  def assert_match(pat, str)
-    m = GlobMatchPattern.new(pat)
-    assert_equal true, m.match(str)
+  def assert_glob_match(pat, str)
+    assert_true GlobMatchPattern.new(pat).match(str)
+    assert_true EventRouter::Rule.new(pat, nil).match?(str)
   end
 
-  def assert_not_match(pat, str)
-    m = GlobMatchPattern.new(pat)
-    assert_equal false, m.match(str)
+  def assert_glob_not_match(pat, str)
+    assert_false GlobMatchPattern.new(pat).match(str)
+    assert_false EventRouter::Rule.new(pat, nil).match?(str)
   end
-end
 
+  def assert_or_match(pats, str)
+    assert_true EventRouter::Rule.new(pats, nil).match?(str)
+  end
+
+  def assert_or_not_match(pats, str)
+    assert_false EventRouter::Rule.new(pats, nil).match?(str)
+  end
+end

data/test/test_mixin.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'fluent/mixin'
 require 'fluent/env'
 require 'fluent/plugin'

data/test/test_output.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'fluent/test'
 require 'fluent/output'
 

data/test/test_parser.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'helper'
 require 'fluent/test'
 require 'fluent/parser'
 
@@ -667,11 +667,13 @@ EOS
       end
     end
 
-    def test_lookup_known_parser
+    data('register_formatter' => 'known', 'register_template' => 'known_old')
+    def test_lookup_known_parser(data)
       $LOAD_PATH.unshift(File.join(File.expand_path(File.dirname(__FILE__)), 'scripts'))
       assert_nothing_raised ConfigError do
-        TextParser::TEMPLATE_REGISTRY.lookup('known')
+        TextParser::TEMPLATE_REGISTRY.lookup(data)
       end
+      $LOAD_PATH.shift
     end
 
     def test_parse_with_return

data/test/test_plugin_classes.rb

@@ -0,0 +1,60 @@
+require_relative 'helper'
+
+module FluentTest
+  class FluentTestOutput < ::Fluent::Output
+    def initialize
+      super
+      @events = Hash.new { |h, k| h[k] = [] }
+    end
+
+    attr_reader :events
+
+    def emit(tag, es, chain)
+      es.each { |time, record|
+        @events[tag] << record
+      }
+    end
+  end
+
+  class FluentTestErrorOutput < ::Fluent::BufferedOutput
+    def format(tag, time, record)
+      raise "emit error!"
+    end
+
+    def write(chunk)
+      raise "chunk error!"
+    end
+  end
+
+  class FluentTestFilter < ::Fluent::Filter
+    def initialize(field = '__test__')
+      super()
+      @num = 0
+      @field = field
+    end
+
+    attr_reader :num
+
+    def filter(tag, time, record)
+      record[@field] = @num
+      @num += 1
+      record
+    end
+  end
+
+  class TestEmitErrorHandler
+    def initialize
+      @events = Hash.new { |h, k| h[k] = [] }
+    end
+
+    attr_reader :events
+
+    def handle_emit_error(tag, time, record, error)
+      @events[tag] << record
+    end
+
+    def handle_emits_error(tag, es, error)
+      es.each { |time,record| handle_emit_error(tag, time, record, error) }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre.2
+  version: 0.12.0.pre.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -252,6 +252,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.2
+- !ruby/object:Gem::Dependency
+  name: test-unit-rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 description: Fluentd is an open source data collector designed to scale and simplify
   log management. It can collect, process and ship many kinds of data in near real-time.
 email:
@@ -286,6 +300,7 @@ files:
 - example/out_copy.conf
 - example/out_file.conf
 - example/out_forward.conf
+- example/v0_12_filter.conf
 - example/v1_literal_example.conf
 - fluent.conf
 - fluentd.gemspec
@@ -328,6 +343,7 @@ files:
 - lib/fluent/plugin/filter_grep.rb
 - lib/fluent/plugin/filter_record_transformer.rb
 - lib/fluent/plugin/in_debug_agent.rb
+- lib/fluent/plugin/in_dummy.rb
 - lib/fluent/plugin/in_exec.rb
 - lib/fluent/plugin/in_forward.rb
 - lib/fluent/plugin/in_gc_stat.rb
@@ -350,7 +366,6 @@ files:
 - lib/fluent/plugin/out_roundrobin.rb
 - lib/fluent/plugin/out_stdout.rb
 - lib/fluent/plugin/out_stream.rb
-- lib/fluent/plugin/out_test.rb
 - lib/fluent/plugin/socket_util.rb
 - lib/fluent/process.rb
 - lib/fluent/registry.rb
@@ -359,6 +374,7 @@ files:
 - lib/fluent/supervisor.rb
 - lib/fluent/test.rb
 - lib/fluent/test/base.rb
+- lib/fluent/test/filter_test.rb
 - lib/fluent/test/input_test.rb
 - lib/fluent/test/output_test.rb
 - lib/fluent/timezone.rb
@@ -371,6 +387,7 @@ files:
 - test/config/test_literal_parser.rb
 - test/config/test_section.rb
 - test/config/test_system_config.rb
+- test/config/test_types.rb
 - test/helper.rb
 - test/plugin/data/2010/01/20100102-030405.log
 - test/plugin/data/2010/01/20100102-030406.log
@@ -382,6 +399,7 @@ files:
 - test/plugin/test_buf_memory.rb
 - test/plugin/test_filter_grep.rb
 - test/plugin/test_filter_record_transformer.rb
+- test/plugin/test_in_dummy.rb
 - test/plugin/test_in_exec.rb
 - test/plugin/test_in_forward.rb
 - test/plugin/test_in_gc_stat.rb
@@ -403,15 +421,19 @@ files:
 - test/plugin/test_out_stream.rb
 - test/scripts/exec_script.rb
 - test/scripts/fluent/plugin/formatter_known.rb
+- test/scripts/fluent/plugin/out_test.rb
 - test/scripts/fluent/plugin/parser_known.rb
 - test/test_buffer.rb
 - test/test_config.rb
 - test/test_configdsl.rb
+- test/test_event_router.rb
 - test/test_formatter.rb
+- test/test_input.rb
 - test/test_match.rb
 - test/test_mixin.rb
 - test/test_output.rb
 - test/test_parser.rb
+- test/test_plugin_classes.rb
 homepage: http://fluentd.org/
 licenses: []
 metadata: {}
@@ -423,7 +445,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -444,6 +466,7 @@ test_files:
 - test/config/test_literal_parser.rb
 - test/config/test_section.rb
 - test/config/test_system_config.rb
+- test/config/test_types.rb
 - test/helper.rb
 - test/plugin/data/2010/01/20100102-030405.log
 - test/plugin/data/2010/01/20100102-030406.log
@@ -455,6 +478,7 @@ test_files:
 - test/plugin/test_buf_memory.rb
 - test/plugin/test_filter_grep.rb
 - test/plugin/test_filter_record_transformer.rb
+- test/plugin/test_in_dummy.rb
 - test/plugin/test_in_exec.rb
 - test/plugin/test_in_forward.rb
 - test/plugin/test_in_gc_stat.rb
@@ -476,12 +500,16 @@ test_files:
 - test/plugin/test_out_stream.rb
 - test/scripts/exec_script.rb
 - test/scripts/fluent/plugin/formatter_known.rb
+- test/scripts/fluent/plugin/out_test.rb
 - test/scripts/fluent/plugin/parser_known.rb
 - test/test_buffer.rb
 - test/test_config.rb
 - test/test_configdsl.rb
+- test/test_event_router.rb
 - test/test_formatter.rb
+- test/test_input.rb
 - test/test_match.rb
 - test/test_mixin.rb
 - test/test_output.rb
 - test/test_parser.rb
+- test/test_plugin_classes.rb