fluent-plugin-ikachan 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 129bc278b4c2d830db65221f0f017873c0b48be8
-  data.tar.gz: 71d5ff09fc4a8ecf424b15011881b734e4325f34
+  metadata.gz: 0a4fb9931b44457d8f8025ba9a91b63e23f02883
+  data.tar.gz: f66fc1159335c8d4aff5196bc640e11591937c1e
 SHA512:
-  metadata.gz: b4bda85897de34d9d946c7f30e8cfcc10e7b0f5f7f34a593c6716eb5148c5194f4c81db3ab7e97aec52ddee1722e7e693b0cdee653ef3209d97aae6f8e8bab60
-  data.tar.gz: 2edfebf85c4cf3a7811ea669dbf31fa66d0d4d36d7f49c8f0613a7ccadf0cadb9d5280020ab6c3dc3619cbbd2b4cfb292ea8cd143ee2b7fadbe90350a05b64a0
+  metadata.gz: 1c8357c8f3936bade2a96e8d3771e0b6fafb41ef7454285fb090e0aebf103a05b9173f0f0a78e734fe936fdc7baa71137430f57fd6faa563d1b097f9a2aa9d79
+  data.tar.gz: 8ab28c3ba870a2e7c33db16483ddda94579b595712c94f6fc63a27f72a779ad6d7f5e70afb5aad200bfff4102082554596eed1aeea74b9c941cffb47a215d074

data/.travis.yml

@@ -1,4 +1,8 @@
+sudo: false
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.1
+  - 2.2
+  - 2.3.3
+before_install:
+  - gem update bundler

data/Rakefile

@@ -8,4 +8,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test

data/fluent-plugin-ikachan.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-ikachan"
-  gem.version       = "0.3.0"
+  gem.version       = "1.0.0"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.summary       = %q{output plugin for IRC-HTTP gateway 'ikachan'}
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency "fluentd", "< 0.14.0"
+  gem.add_runtime_dependency "fluentd", ">= 0.14.0"
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "test-unit"
+  gem.add_development_dependency "test-unit", "~> 3.0"
 end

data/lib/fluent/plugin/out_ikachan.rb

@@ -1,31 +1,25 @@
-class Fluent::IkachanOutput < Fluent::Output
-  Fluent::Plugin.register_output('ikachan', self)
+require 'fluent/plugin/output'
 
-  # Define `log` method for v0.10.42 or earlier
-  unless method_defined?(:log)
-    define_method("log") { $log }
-  end
+require 'net/http'
+require 'uri'
+
+class Fluent::Plugin::IkachanOutput < Fluent::Plugin::Output
+  Fluent::Plugin.register_output('ikachan', self)
 
-  config_param :host, :string, :default => nil
-  config_param :port, :integer, :default => 4979
-  config_param :base_uri, :string, :default => nil
-  config_param :ssl, :bool, :default => nil
-  config_param :verify_ssl, :bool, :default => false
+  config_param :host, :string, default: nil
+  config_param :port, :integer, default: 4979
+  config_param :base_uri, :string, default: nil
+  config_param :ssl, :bool, default: nil
+  config_param :verify_ssl, :bool, default: false
   config_param :channel, :string
-  config_param :message, :string, :default => nil
-  config_param :out_keys, :string, :default => ""
-  config_param :privmsg_message, :string, :default => nil
-  config_param :privmsg_out_keys, :string, :default => ""
-  config_param :time_key, :string, :default => nil
-  config_param :time_format, :string, :default => nil
-  config_param :tag_key, :string, :default => 'tag'
-  config_param :post_per_line, :bool, :default => true
-
-  def initialize
-    super
-    require 'net/http'
-    require 'uri'
-  end
+  config_param :message, :string, default: nil
+  config_param :out_keys, :string, default: ""
+  config_param :privmsg_message, :string, default: nil
+  config_param :privmsg_out_keys, :string, default: ""
+  config_param :time_key, :string, default: nil
+  config_param :time_format, :string, default: nil
+  config_param :tag_key, :string, default: 'tag'
+  config_param :post_per_line, :bool, default: true
 
   def configure(conf)
     super
@@ -91,6 +85,7 @@ class Fluent::IkachanOutput < Fluent::Output
   end
 
   def start
+    super
     res = http_post_request(@join_uri, {'channel' => @channel})
     if res.is_a?(Net::HTTPSuccess)
       # ok
@@ -101,10 +96,7 @@ class Fluent::IkachanOutput < Fluent::Output
     end
   end
 
-  def shutdown
-  end
-
-  def emit(tag, es, chain)
+  def process(tag, es)
     posts = []
 
     es.each do |time,record|
@@ -121,25 +113,20 @@ class Fluent::IkachanOutput < Fluent::Output
       begin
         if @post_per_line
           msg.split("\n").each do |m|
-            res = http_post_request(uri, {'channel' => @channel, 'message' => m})
+            http_post_request(uri, {'channel' => @channel, 'message' => m})
           end
         else
-          res = http_post_request(uri, {'channel' => @channel, 'message' => msg})
+          http_post_request(uri, {'channel' => @channel, 'message' => msg})
         end
-      rescue
-        log.warn "out_ikachan: failed to send notice to #{@host}:#{@port}, #{@channel}, message: #{msg}"
+      rescue => e
+        log.warn "failed to send notice", host: @host, port: @port, channel: @channel, message: msg, error: e
       end
     end
-
-    chain.next
   end
 
   private
 
   def evaluate_message(message, out_keys, tag, time, record)
-    values = []
-    last = out_keys.length - 1
-
     values = out_keys.map do |key|
       case key
       when @time_key

data/test/plugin/test_out_ikachan.rb

@@ -1,8 +1,12 @@
 require 'helper'
+require 'fluent/test/driver/output'
+require 'fluent/test/helpers'
 require 'cgi'
 require 'uri'
 
 class IkachanOutputTest < Test::Unit::TestCase
+  include Fluent::Test::Helpers
+
   IKACHAN_TEST_LISTEN_PORT = 4979
 
   CONFIG = %[
@@ -138,8 +142,8 @@ class IkachanOutputTest < Test::Unit::TestCase
     tag_key tag
   ]
 
-  def create_driver(conf=CONFIG,tag='test')
-    Fluent::Test::OutputTestDriver.new(Fluent::IkachanOutput, tag).configure(conf)
+  def create_driver(conf=CONFIG)
+    Fluent::Test::Driver::Output.new(Fluent::Plugin::IkachanOutput).configure(conf)
   end
 
   def test_configure
@@ -190,12 +194,11 @@ class IkachanOutputTest < Test::Unit::TestCase
   # ]
   def test_notice_and_privmsg
     d = create_driver
-    t = Time.now
-    time = t.to_i
-    ts = t.strftime(d.instance.time_format)
-    d.run do
-      d.emit({'msg' => "both notice and privmsg message from fluentd out_ikachan: testing now"}, time)
-      d.emit({'msg' => "both notice and privmsg message from fluentd out_ikachan: testing second line"}, time)
+    time = event_time
+    ts = Time.at(time.to_r).strftime(d.instance.time_format)
+    d.run(default_tag: 'test') do
+      d.feed(time, {'msg' => "both notice and privmsg message from fluentd out_ikachan: testing now"})
+      d.feed(time, {'msg' => "both notice and privmsg message from fluentd out_ikachan: testing second line"})
     end
 
     assert_equal 4, @posted.length
@@ -227,12 +230,11 @@ class IkachanOutputTest < Test::Unit::TestCase
   # ]
   def test_notice_only
     d = create_driver(CONFIG_NOTICE_ONLY)
-    t = Time.now
-    time = t.to_i
-    ts = t.strftime(d.instance.time_format)
-    d.run do
-      d.emit({'msg' => "notice message from fluentd out_ikachan: testing now"}, time)
-      d.emit({'msg' => "notice message from fluentd out_ikachan: testing second line"}, time)
+    time = event_time
+    ts = Time.at(time.to_r).strftime(d.instance.time_format)
+    d.run(default_tag: 'test') do
+      d.feed(time, {'msg' => "notice message from fluentd out_ikachan: testing now"})
+      d.feed(time, {'msg' => "notice message from fluentd out_ikachan: testing second line"})
     end
 
     assert_equal 2, @posted.length
@@ -257,12 +259,11 @@ class IkachanOutputTest < Test::Unit::TestCase
   # ]
   def test_privmsg_only
     d = create_driver(CONFIG_PRIVMSG_ONLY)
-    t = Time.now
-    time = t.to_i
-    ts = t.strftime(d.instance.time_format)
-    d.run do
-      d.emit({'msg' => "privmsg message from fluentd out_ikachan: testing now"}, time)
-      d.emit({'msg' => "privmsg message from fluentd out_ikachan: testing second line"}, time)
+    time = event_time
+    ts = Time.at(time.to_r).strftime(d.instance.time_format)
+    d.run(default_tag: 'test') do
+      d.feed({'msg' => "privmsg message from fluentd out_ikachan: testing now"})
+      d.feed({'msg' => "privmsg message from fluentd out_ikachan: testing second line"})
     end
 
     assert_equal 2, @posted.length
@@ -289,11 +290,10 @@ class IkachanOutputTest < Test::Unit::TestCase
   # ]
   def test_line_feed
     d = create_driver(CONFIG_LINE_FEED)
-    t = Time.now
-    time = t.to_i
-    ts = t.strftime(d.instance.time_format)
-    d.run do
-      d.emit({'msg' => "both notice and privmsg message from fluentd out_ikachan: testing now\ntesting second line"}, time)
+    time = event_time
+    ts = Time.at(time.to_r).strftime(d.instance.time_format)
+    d.run(default_tag: 'test') do
+      d.feed(time, {'msg' => "both notice and privmsg message from fluentd out_ikachan: testing now\ntesting second line"})
     end
 
     assert_equal 6, @posted.length
@@ -343,11 +343,10 @@ class IkachanOutputTest < Test::Unit::TestCase
   # ]
   def test_post_per_line_false
     d = create_driver(CONFIG_POST_PER_LINE_FALSE)
-    t = Time.now
-    time = t.to_i
-    ts = t.strftime(d.instance.time_format)
-    d.run do
-      d.emit({'msg' => "both notice and privmsg message from fluentd out_ikachan: testing now\ntesting second line"}, time)
+    time = event_time
+    ts = Time.at(time.to_r).strftime(d.instance.time_format)
+    d.run(default_tag: 'test') do
+      d.feed(time, {'msg' => "both notice and privmsg message from fluentd out_ikachan: testing now\ntesting second line"})
     end
 
     assert_equal 2, @posted.length
@@ -375,12 +374,11 @@ class IkachanOutputTest < Test::Unit::TestCase
   def test_base_uri
     with_base_path('/ikachan/') do
       d = create_driver(CONFIG_BASE_URI)
-      t = Time.now
-      time = t.to_i
-      ts = t.strftime(d.instance.time_format)
-      d.run do
-        d.emit({'msg' => "notice message from fluentd out_ikachan: testing now"}, time)
-        d.emit({'msg' => "notice message from fluentd out_ikachan: testing second line"}, time)
+      time = event_time
+      ts = Time.at(time.to_r).strftime(d.instance.time_format)
+      d.run(default_tag: 'test') do
+        d.feed(time, {'msg' => "notice message from fluentd out_ikachan: testing now"})
+        d.feed(time, {'msg' => "notice message from fluentd out_ikachan: testing second line"})
       end
 
       assert_equal 2, @posted.length
@@ -404,10 +402,10 @@ class IkachanOutputTest < Test::Unit::TestCase
     @mount = '/' # @mount 's first and last char should be '/'. it is for dummy server path handling
     @dummy_server_thread = Thread.new do
       srv = if ENV['VERBOSE']
-              WEBrick::HTTPServer.new({:BindAddress => '127.0.0.1', :Port => IKACHAN_TEST_LISTEN_PORT})
+              WEBrick::HTTPServer.new({BindAddress: '127.0.0.1', Port: IKACHAN_TEST_LISTEN_PORT})
             else
               logger = WEBrick::Log.new('/dev/null', WEBrick::BasicLog::DEBUG)
-              WEBrick::HTTPServer.new({:BindAddress => '127.0.0.1', :Port => IKACHAN_TEST_LISTEN_PORT, :Logger => logger, :AccessLog => []})
+              WEBrick::HTTPServer.new({BindAddress: '127.0.0.1', Port: IKACHAN_TEST_LISTEN_PORT, Logger: logger, AccessLog: []})
             end
       begin
         srv.mount_proc('/') { |req,res| # /join, /notice, /privmsg
@@ -452,7 +450,7 @@ class IkachanOutputTest < Test::Unit::TestCase
             next
           end
 
-          @posted.push({ :method => method, :channel => post_param['channel'].first, :message => post_param['message'].first})
+          @posted.push({ method: method, channel: post_param['channel'].first, message: post_param['message'].first})
           res.status = 200
         }
         srv.start
@@ -463,7 +461,7 @@ class IkachanOutputTest < Test::Unit::TestCase
     # to wait completion of dummy server.start()
     require 'thread'
     cv = ConditionVariable.new
-    watcher = Thread.new {
+    Thread.new {
       connected = false
       while not connected
         begin
@@ -490,13 +488,14 @@ class IkachanOutputTest < Test::Unit::TestCase
     port = d.instance.port
     client = Net::HTTP.start(host, port)
 
-    assert_equal '200', client.request_post('/', '').code
-    assert_equal '200', client.request_post('/join', 'channel=#test').code
+    header = {"Content-Type" => "application/x-www-form-urlencoded"}
+    assert_equal '200', client.request_post('/', '', header).code
+    assert_equal '200', client.request_post('/join', 'channel=#test', header).code
 
     assert_equal 0, @posted.size
 
-    assert_equal '200', client.request_post('/notice', 'channel=#test&message=NOW TESTING').code
-    assert_equal '200', client.request_post('/privmsg', 'channel=#test&message=NOW TESTING 2').code
+    assert_equal '200', client.request_post('/notice', 'channel=#test&message=NOW TESTING', header).code
+    assert_equal '200', client.request_post('/privmsg', 'channel=#test&message=NOW TESTING 2', header).code
 
     assert_equal 2, @posted.size
 
@@ -505,12 +504,12 @@ class IkachanOutputTest < Test::Unit::TestCase
     assert_equal 'NOW TESTING', @posted[0][:message]
 
     @mount = '/ikachan/'
-    assert_equal '404', client.request_post('/', '').code
-    assert_equal '404', client.request_post('/join', 'channel=#test').code
+    assert_equal '404', client.request_post('/', '', header).code
+    assert_equal '404', client.request_post('/join', 'channel=#test', header).code
 
-    assert_equal '200', client.request_post('/ikachan/', '').code
-    assert_equal '404', client.request_post('/ikachan/test', 'channel=#test').code
-    assert_equal '200', client.request_post('/ikachan/join', 'channel=#test').code
+    assert_equal '200', client.request_post('/ikachan/', '', header).code
+    assert_equal '404', client.request_post('/ikachan/test', 'channel=#test', header).code
+    assert_equal '200', client.request_post('/ikachan/join', 'channel=#test', header).code
   end
 
   def teardown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-ikachan
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - TAGOMORI Satoshi
@@ -14,14 +14,14 @@ dependencies:
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.0
 - !ruby/object:Gem::Dependency
@@ -42,16 +42,16 @@ dependencies:
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: 'output plugin for IRC-HTTP gateway ''ikachan'' (see: https://metacpan.org/module/ikachan
   and (jpn) http://blog.yappo.jp/yappo/archives/000760.html)'
 email: