fluent-plugin-typetalk 0.0.10 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41fa3e1b64d08b062ff5685d192d51a65402fc09
-  data.tar.gz: 4c0b032d779028cf33d833a098e68f7a7b2f5b7d
+  metadata.gz: c26fbbe7bb559565f3bdb6c7846430282d91b879
+  data.tar.gz: 79b971d2139d25436bed76ba7163bbadb4937443
 SHA512:
-  metadata.gz: d1a4acc36a0088d8f378771370d5a498cc36984a184b34b2ac1c34fff12d1b868a6a0a3ad06a5fd3c63eb4726a7e4c2a7fc90b6f92f5a22a95f94ed73cac1773
-  data.tar.gz: 542ca5ebfce89548c804c25f2a704e9742f0c36d2ea421fe83d08b6134bd691d62eb0d1737aaa4821ff1ea887266110236e76c403290f9fb89dc9b9842679aed
+  metadata.gz: ea738ab0a0bf841ec1ce1156891f3142f64c50b5d9d5a3b143afe58b12c912c1215e16811a80e0070872f1040ddec1a5dc94b973f324213dfda5a48ca4e4e25d
+  data.tar.gz: bbf2962d634e073ba597be18f1a7240946ade5e644b06b52d32053eacfe115b0acbaaad9a3c4c62fc1779052ff7d379c84fba3760bcd69241c52eddb851f6ecb

data/.travis.yml

@@ -1,8 +1,13 @@
 language: ruby
 rvm:
-  - 1.9.3
+  - 2.1
+  - 2.2
+  - 2.3
+  - 2.4
 before_install:
   - gem update bundler
+script:
+  - bundle exec rake test
 notifications:
   webhooks:
     urls:

data/README.md

@@ -4,6 +4,13 @@
 
 [Fluentd](http://fluentd.org) plugin to emit notifications to [Typetalk](http://typetalk.in/).
 
+## Requirements
+
+| fluent-plugin-typetalk | fluentd    | ruby   |
+|------------------------|------------|--------|
+| >= 0.1.0               | >= v0.14.0 | >= 2.1 |
+| < 0.1.0                | >= v0.12.0 | >= 1.9 |
+
 ## Installation
 
 Install with gem or fluent-gem command as:

data/Rakefile

@@ -1,10 +1,12 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.test_files = FileList['test/plugin/*.rb']
   test.verbose = true
 end
 
-task :default => :test
+task :default => :test

data/fluent-plugin-typetalk.gemspec

@@ -1,10 +1,9 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-typetalk"
-  spec.version       = "0.0.10"
+  spec.version       = "0.1.0"
   spec.authors       = ["tksmd","umakoz"]
   spec.email         = ["someda@isenshi.com"]
   spec.description   = %q{fluent plugin to send message to typetalk}
@@ -18,14 +17,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rr", ">= 1.0.0"
-  spec.add_development_dependency "test-unit", "> 3"
-  spec.add_development_dependency "test-unit-rr"
-  # not to use mime-types 3.0 that doesn't support ruby 1.9.x
-  spec.add_runtime_dependency "mime-types", "~> 2.6", "< 2.99"
-  spec.add_runtime_dependency "fluentd"
-  spec.add_runtime_dependency "typetalk"
+  spec.add_development_dependency "rake", ">= 0.9.2"
+  spec.add_development_dependency "test-unit", ">= 3.1.0"
+  spec.add_development_dependency "test-unit-rr", ">= 1.0.5"
 
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.add_runtime_dependency "fluentd", [">= 0.14.0", "< 2"]
+  spec.add_runtime_dependency "typetalk"
 end

data/lib/fluent/plugin/out_typetalk.rb

@@ -1,5 +1,5 @@
-module Fluent
-  class TypetalkOutput < Fluent::Output
+module Fluent::Plugin
+  class TypetalkOutput < Fluent::Plugin::Output
     Fluent::Plugin.register_output('typetalk', self)
 
     config_param :client_id, :string
@@ -73,7 +73,7 @@ module Fluent
       super
     end
 
-    def emit(tag, es, chain)
+    def process(tag, es)
       es.each do |time, record|
         if @need_throttle && throttle(time)
           log.error("out_typetalk:", :error => "number of posting message within #{@interval}(sec) reaches to the limit #{@limit}")
@@ -86,8 +86,6 @@ module Fluent
           log.error("out_typetalk:", :error_class => e.class, :error => e.message)
         end
       end
-
-      chain.next
     end
 
     def throttle(time)

data/test/helper.rb

@@ -1,29 +1,9 @@
-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 "bundler/setup"
+$LOAD_PATH.unshift(File.join(__dir__, '..', 'lib'))
+$LOAD_PATH.unshift(__dir__)
+
 require 'test/unit'
 require 'test/unit/rr'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'fluent/test'
-unless ENV.has_key?('VERBOSE')
-  nulllogger = Object.new
-  nulllogger.instance_eval {|obj|
-    def method_missing(method, *args)
-      # pass
-    end
-  }
-  $log = nulllogger
-end
-
-require 'fluent/plugin/out_typetalk'
-
-class Test::Unit::TestCase
-end
+require 'fluent/test/driver/output'
+require 'fluent/test/helpers'

data/test/plugin/test_out_typetalk.rb

@@ -1,9 +1,10 @@
 # coding: utf-8
 
 require 'helper'
+require 'fluent/plugin/out_typetalk'
 
 class TypetalkOutputTest < Test::Unit::TestCase
-  
+
   def setup
     Fluent::Test.setup
   end
@@ -50,8 +51,8 @@ class TypetalkOutputTest < Test::Unit::TestCase
   ]
 
 
-  def create_driver(conf = CONFIG, tag = 'test')
-    Fluent::Test::OutputTestDriver.new(Fluent::TypetalkOutput, tag).configure(conf)
+  def create_driver(conf = CONFIG)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::TypetalkOutput).configure(conf)
   end
 
   def test_configure
@@ -71,20 +72,22 @@ class TypetalkOutputTest < Test::Unit::TestCase
   def test_write
     d = create_driver()
     mock(d.instance.typetalk).post_message(1, 'notice : test1')
-    d.emit({'message' => 'test1'})
-    d.run()
+    d.run(default_tag: "test") do
+      d.feed({'message' => 'test1'})
+    end
   end
 
   def test_template
-    d = create_driver(CONFIG, 'warn')
+    d = create_driver()
     d.instance.message = "notice : %s [%s]"
     d.instance.out_keys = ["message", "time"]
     mock(d.instance.typetalk).post_message(1, "notice : test1 [1399910738]")
 
     ENV["TZ"]="Asia/Tokyo"
     t = Time.strptime('2014-05-13 01:05:38', '%Y-%m-%d %T')
-    d.emit({'message' => 'test1'}, t)
-    d.run()
+    d.run(default_tag: "warn") do
+      d.feed(t.to_i, {'message' => 'test1'})
+    end
   end
 
   def test_post_message_unauthorized_error
@@ -94,11 +97,12 @@ class TypetalkOutputTest < Test::Unit::TestCase
     }
     stub(d.instance.log).error {|name, params|
       assert_equal "out_typetalk:", name
-      assert_equal Fluent::TypetalkError, params[:error_class]
+      assert_equal Fluent::Plugin::TypetalkError, params[:error_class]
       assert_equal "invalid credentials used. check client_id and client_secret in your configuration.", params[:error]
     }
-    d.emit({'message' => 'test1'})
-    d.run()
+    d.run(default_tag: "test") do
+      d.feed({'message' => 'test1'})
+    end
   end
 
   def test_post_message_invalid_request_error
@@ -108,11 +112,12 @@ class TypetalkOutputTest < Test::Unit::TestCase
     }
     stub(d.instance.log).error {|name, params|
       assert_equal "out_typetalk:", name
-      assert_equal Fluent::TypetalkError, params[:error_class]
+      assert_equal Fluent::Plugin::TypetalkError, params[:error_class]
       assert_equal "failed to post, msg: invalid_client, code: 400", params[:error]
     }
-    d.emit({'message' => 'test1'})
-    d.run()
+    d.run(default_tag: "test") do
+      d.feed({'message' => 'test1'})
+    end
   end
 
   def test_post_message_maxlength_error
@@ -122,11 +127,12 @@ class TypetalkOutputTest < Test::Unit::TestCase
     }
     stub(d.instance.log).error {|name, params|
       assert_equal "out_typetalk:", name
-      assert_equal Fluent::TypetalkError, params[:error_class]
+      assert_equal Fluent::Plugin::TypetalkError, params[:error_class]
       assert_equal "failed to post, msg: message : Maximum length is 4,096 characters., code: 400", params[:error]
     }
-    d.emit({'message' => 'test1'})
-    d.run()
+    d.run(default_tag: "test") do
+      d.feed({'message' => 'test1'})
+    end
   end
 
   def test_post_message_notfound_error
@@ -136,11 +142,12 @@ class TypetalkOutputTest < Test::Unit::TestCase
     }
     stub(d.instance.log).error {|name, params|
       assert_equal "out_typetalk:", name
-      assert_equal Fluent::TypetalkError, params[:error_class]
+      assert_equal Fluent::Plugin::TypetalkError, params[:error_class]
       assert_equal "failed to post, msg: , code: 404", params[:error]
     }
-    d.emit({'message' => 'test1'})
-    d.run()
+    d.run(default_tag: "test") do
+      d.feed({'message' => 'test1'})
+    end
   end
 
   def test_oauth2_error
@@ -150,11 +157,12 @@ class TypetalkOutputTest < Test::Unit::TestCase
     }
     stub(d.instance.log).error {|name, params|
       assert_equal "out_typetalk:", name
-      assert_equal Fluent::TypetalkError, params[:error_class]
+      assert_equal Fluent::Plugin::TypetalkError, params[:error_class]
       assert_equal "failed to post, msg: Bearer error=\"invalid_scope\", code: 400", params[:error]
     }
-    d.emit({'message' => 'test1'})
-    d.run()
+    d.run(default_tag: "test") do
+      d.feed({'message' => 'test1'})
+    end
   end
 
   def test_throttle
@@ -165,11 +173,12 @@ class TypetalkOutputTest < Test::Unit::TestCase
       assert_equal "out_typetalk:", name
       assert_equal "number of posting message within 5.0(sec) reaches to the limit 1", params[:error]
     }
-    d.emit({'message' => 'test1'})
-    d.emit({'message' => 'test2'})
-    sleep 5
-    d.emit({'message' => 'test3'})
-    d.run()
+    d.run(default_tag: "test") do
+      d.feed({'message' => 'test1'})
+      d.feed({'message' => 'test2'})
+      sleep 5
+      d.feed({'message' => 'test3'})
+    end
   end
 
   def test_truncate
@@ -177,10 +186,11 @@ class TypetalkOutputTest < Test::Unit::TestCase
     mock(d.instance.typetalk).post_message(1, '1')
     mock(d.instance.typetalk).post_message(1, '1'*3999)
     mock(d.instance.typetalk).post_message(1, '1'*3995 + ' ...')
-    d.emit({'message' => '1'})
-    d.emit({'message' => '1'*3999}) # not truncated
-    d.emit({'message' => '1'*4000}) # should be truncated
-    d.run()
+    d.run(default_tag: "test") do
+      d.feed({'message' => '1'})
+      d.feed({'message' => '1'*3999}) # not truncated
+      d.feed({'message' => '1'*4000}) # should be truncated
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-typetalk
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors:
 - tksmd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -31,90 +31,62 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: rr
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '3'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: test-unit-rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.99'
-- !ruby/object:Gem::Dependency
-  name: fluentd
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: 0.14.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: typetalk
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -166,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: fluent plugin to send message to typetalk