fluent-plugin-map 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: decebfbf41fc12fb15d386f4ff981c47f8664d29
-  data.tar.gz: 0cae24b1126273459013218f0928e84e1087b243
+  metadata.gz: b302dc881feff3cac6eaeb20d2fb12f9ad1ae4a1
+  data.tar.gz: c3112052a37a51f54261c3fb8f7d5ca1261c20e2
 SHA512:
-  metadata.gz: 524e10fd9c10a5eeda5e048f537b33bcb555b2a16229d033cd78a7c5f80fcab8319cf2e3fa067cd76e7904f945a3d518d1c54fda9a9faf9143fd6565132a6ae4
-  data.tar.gz: fbec0673c454365306cb61d1f8d9162c38e3a0d37078986321b95871b08378d02efe625747a06657113303eb5c2810a1a08cffcc704af09c5fb8db40864975d6
+  metadata.gz: f44a0174b92c370bfa09516e8cf4eb1fec642c72811c9b40d338dcbcae71fc1c995b45e8f1fdcee7990ba64af1226406f74e0b7eccbbfdb462389cebf80fa630
+  data.tar.gz: 902ad79813947cc1710a3afe161ecb102372061904982d1a86afef26bbaf675e9ef33f6b3f6f1fd824507f0a13acc2a25fda484feb217533e3babeea37138248

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
 .bundle
 Gemfile.lock
+gemfiles/*.lock
 pkg/*

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 2.1
+  - 2.2
+before_install:
+  - gem update bundler
+gemfile:
+  - gemfiles/fluentd_0_10.gemfile
+  - gemfiles/fluentd_0_12.gemfile
+  - gemfiles/fluentd_0_14.gemfile

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "fluentd-0-10" do
+  gem "fluentd", "~>0.10.0"
+end
+
+appraise "fluentd-0-12" do
+  gem "fluentd", "~>0.12.0"
+end
+
+appraise "fluentd-0-14" do
+  gem "fluentd", "~>0.14.0"
+end

data/README.markdown

@@ -1,5 +1,7 @@
 # fluent-plugin-map
 
+[![Build Status](https://travis-ci.org/tomity/fluent-plugin-map.svg?branch=master)](https://travis-ci.org/tomity/fluent-plugin-map)
+
 fluent-plugin-map(out\_map) is the non-buffered plugin that can convert an event log to different event log(s)
 
 ## Example

data/fluent-plugin-map.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-map"
-  s.version     = "0.0.5"
+  s.version     = "0.0.6"
   s.authors     = ["Kohei Tomita"]
   s.email       = ["tommy.fmale@gmail.com"]
   s.homepage    = "https://github.com/tomity/fluent-plugin-map"
@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rake", "~> 0.9.2.2"
-  s.add_development_dependency "fluentd", "~> 0.10.24"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "fluentd", [">= 0.10.24", "< 2"]
+  s.add_development_dependency "test-unit", "~> 3.1"
+  s.add_development_dependency "appraisal"
 end

data/gemfiles/fluentd_0_10.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "fluentd", "~>0.10.0"
+
+gemspec :path => "../"

data/gemfiles/fluentd_0_12.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "fluentd", "~>0.12.0"
+
+gemspec :path => "../"

data/gemfiles/fluentd_0_14.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "fluentd", "~>0.14.0"
+
+gemspec :path => "../"

data/lib/fluent/plugin/out_map.rb

@@ -3,9 +3,14 @@ module Fluent
   class MapOutput < Fluent::Output
     Fluent::Plugin.register_output('map', self)
 
+    # Define `router` method of v0.12 to support v0.10 or earlier
+    unless method_defined?(:router)
+      define_method("router") { Fluent::Engine }
+    end
+
     config_param :map, :string, :default => nil
     config_param :tag, :string, :default => nil
-    config_param :key, :string, :default => nil #deprected
+    config_param :key, :string, :default => nil #deprecated
     config_param :time, :string, :default => nil
     config_param :record, :string, :default => nil
     config_param :multi, :bool, :default => false
@@ -29,7 +34,7 @@ module Fluent
       elsif (@tag || @key) && @time && @record
         "record"
       else
-        raise ConfigError, "Any of map, 3 parameters(key, time, and record) or format is required "
+        raise ConfigError, "Any of map, 3 parameters(tag, time, and record) or format is required "
       end
     end
 
@@ -69,7 +74,7 @@ module Fluent
 
     def parse_multimap(conf)
       check_mmap_range(conf)
-      
+
       prev_mmap = nil
       result_mmaps = (1..MMAP_MAX_NUM).map { |i|
         mmap = conf["mmap#{i}"]
@@ -99,7 +104,7 @@ module Fluent
       begin
         tag_output_es = do_map(tag, es)
         tag_output_es.each_pair do |tag, output_es|
-          Fluent::Engine::emit_stream(tag, output_es)
+          router.emit_stream(tag, output_es)
         end
         chain.next
         tag_output_es

data/test/plugin/test_out_map.rb

@@ -16,7 +16,7 @@ class MapOutputTest < Test::Unit::TestCase
 
   def test_tag_convert
     tag = 'tag'
-    time = Time.local(2012, 10, 10, 10, 10, 10)
+    time = Time.local(2012, 10, 10, 10, 10, 10).to_i
     record = {'code' => '300'}
 
     d1 = create_driver %[
@@ -27,12 +27,12 @@ class MapOutputTest < Test::Unit::TestCase
     end
     emits = d1.emits
     assert_equal 1, emits.length
-    assert_equal ["newtag", time.to_i, record], emits[0]
+    assert_equal ["newtag", time, record], emits[0]
   end
 
   def test_convert_multi_tag
     tag = 'tag'
-    time = Time.local(2012, 10, 10, 10, 10, 10)
+    time = Time.local(2012, 10, 10, 10, 10, 10).to_i
     record = {'code' => '300'}
 
     d1 = create_driver %[
@@ -44,13 +44,13 @@ class MapOutputTest < Test::Unit::TestCase
     end
     emits = d1.emits
     assert_equal 2, emits.length
-    assert_equal ["tag1", time.to_i, record], emits[0]
-    assert_equal ["tag2", time.to_i, record], emits[1]
+    assert_equal ["tag1", time, record], emits[0]
+    assert_equal ["tag2", time, record], emits[1]
   end
 
   def test_syntax_error
     tag = "tag"
-    time = Time.local(2012, 10, 10, 10, 10, 0)
+    time = Time.local(2012, 10, 10, 10, 10, 0).to_i
     record = {'code' => '300'}
 
     #map is syntax error
@@ -58,7 +58,7 @@ class MapOutputTest < Test::Unit::TestCase
       map tag.
     ]
     d1 = create_driver(syntax_error_config, tag)
-    es = Fluent::OneEventStream.new(time.to_i, record)
+    es = Fluent::OneEventStream.new(time, record)
     chain = Fluent::Test::TestOutputChain.new
     e =  d1.instance.emit(tag, es, chain)
     assert e.kind_of?(SyntaxError)
@@ -66,7 +66,7 @@ class MapOutputTest < Test::Unit::TestCase
 
   def test_syntax_error2
     tag = "tag"
-    time = Time.local(2012, 10, 10, 10, 10, 0)
+    time = Time.local(2012, 10, 10, 10, 10, 0).to_i
     record = {'code' => '300'}
 
     #map output lligal format
@@ -74,7 +74,7 @@ class MapOutputTest < Test::Unit::TestCase
       map tag
     ]
     d1 = create_driver(syntax_error_config, tag)
-    es = Fluent::OneEventStream.new(time.to_i, record)
+    es = Fluent::OneEventStream.new(time, record)
     chain = Fluent::Test::TestOutputChain.new
     e =  d1.instance.emit(tag, es, chain)
     assert e.kind_of?(SyntaxError)
@@ -82,7 +82,7 @@ class MapOutputTest < Test::Unit::TestCase
 
   def test_tag_convert_using_tag_time_record
     tag = 'tag'
-    time = Time.local(2012, 10, 10, 10, 10, 10)
+    time = Time.local(2012, 10, 10, 10, 10, 10).to_i
     record = {'code' => '300'}
 
     d1 = create_driver %[
@@ -95,13 +95,13 @@ class MapOutputTest < Test::Unit::TestCase
     end
     emits = d1.emits
     assert_equal 1, emits.length
-    assert_equal ["newtag", time.to_i, record], emits[0]
+    assert_equal ["newtag", time, record], emits[0]
   end
 
   #deprected specification test
   def test_tag_convert_using_key_time_record
     tag = 'tag'
-    time = Time.local(2012, 10, 10, 10, 10, 10)
+    time = Time.local(2012, 10, 10, 10, 10, 10).to_i
     record = {'code' => '300'}
 
     d1 = create_driver %[
@@ -114,12 +114,12 @@ class MapOutputTest < Test::Unit::TestCase
     end
     emits = d1.emits
     assert_equal 1, emits.length
-    assert_equal ["newtag", time.to_i, record], emits[0]
+    assert_equal ["newtag", time, record], emits[0]
   end
 
   def test_config_error_tag
     tag = "tag"
-    time = Time.local(2012, 10, 10, 10, 10, 0)
+    time = Time.local(2012, 10, 10, 10, 10, 0).to_i
     record = {'code' => '300'}
 
     #require time
@@ -146,7 +146,7 @@ class MapOutputTest < Test::Unit::TestCase
 
   def test_config_error_record
     tag = "tag"
-    time = Time.local(2012, 10, 10, 10, 10, 0)
+    time = Time.local(2012, 10, 10, 10, 10, 0).to_i
 
     #require record
     assert_raise(Fluent::ConfigError){
@@ -159,8 +159,7 @@ class MapOutputTest < Test::Unit::TestCase
 
   def test_config_error_multi
     tag = "tag"
-    time = Time.local(2012, 10, 10, 10, 10, 0)
-    #time = Time.local(2012, 10, 10, 10, 10, 0)
+    time = Time.local(2012, 10, 10, 10, 10, 0).to_i
     record = {'code' => '300'}
 
     #require time
@@ -176,7 +175,7 @@ class MapOutputTest < Test::Unit::TestCase
 
   def test_timeout
     tag = 'tag'
-    time = Time.local(2012, 10, 10, 10, 10, 10)
+    time = Time.local(2012, 10, 10, 10, 10, 10).to_i
     record = {'code' => '300'}
 
     d1 = create_driver %[
@@ -195,11 +194,11 @@ class MapOutputTest < Test::Unit::TestCase
   # Add format test
   ## test format type (map, record, maps)
   ## test Backward compatibility without format
-  ## 
+  ##
 
   def test_convert_format_map
     tag = 'tag'
-    time = Time.local(2012, 10, 10, 10, 10, 10)
+    time = Time.local(2012, 10, 10, 10, 10, 10).to_i
     record = {'code1' => '300', 'code2' => '400'}
 
     d1 = create_driver %[
@@ -212,13 +211,13 @@ class MapOutputTest < Test::Unit::TestCase
     end
     emits = d1.emits
     assert_equal 2, emits.length
-    assert_equal ["tag1", time.to_i, record["code1"]], emits[0]
-    assert_equal ["tag2", time.to_i, record["code2"]], emits[1]
+    assert_equal ["tag1", time, record["code1"]], emits[0]
+    assert_equal ["tag2", time, record["code2"]], emits[1]
   end
 
   def test_tag_convert_format_record
     tag = 'tag'
-    time = Time.local(2012, 10, 10, 10, 10, 10)
+    time = Time.local(2012, 10, 10, 10, 10, 10).to_i
     record = {'code' => '300'}
 
     d1 = create_driver %[
@@ -232,12 +231,12 @@ class MapOutputTest < Test::Unit::TestCase
     end
     emits = d1.emits
     assert_equal 1, emits.length
-    assert_equal ["newtag", time.to_i, record], emits[0]
+    assert_equal ["newtag", time, record], emits[0]
   end
 
   def test_convert_format_multimap
     tag = 'tag'
-    time = Time.local(2012, 10, 10, 10, 10, 10)
+    time = Time.local(2012, 10, 10, 10, 10, 10).to_i
     record = {'code1' => '300', 'code2' => '400'}
 
     d1 = create_driver %[
@@ -250,7 +249,7 @@ class MapOutputTest < Test::Unit::TestCase
     end
     emits = d1.emits
     assert_equal 2, emits.length
-    assert_equal ["tag1", time.to_i, record["code1"]], emits[0]
-    assert_equal ["tag2", time.to_i, record["code2"]], emits[1]
+    assert_equal ["tag1", time, record["code1"]], emits[0]
+    assert_equal ["tag2", time, record["code2"]], emits[1]
   end
 end

metadata

@@ -1,43 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-map
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Kohei Tomita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.24
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.24
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'fluent-plugin-map is the non-buffered plugin that can convert an event
   log to different event log(s).  '
 email:
@@ -47,11 +81,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
 - fluent-plugin-map.gemspec
+- gemfiles/fluentd_0_10.gemfile
+- gemfiles/fluentd_0_12.gemfile
+- gemfiles/fluentd_0_14.gemfile
 - lib/fluent/plugin/out_map.rb
 - test/helper.rb
 - test/plugin/test_out_map.rb