daioikachan 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63ee532c54d5c3cbcf00169ee3d1b2fb6621c917
-  data.tar.gz: 0d3b4eacfbf125714a467a5544dfd6c50752a225
+  metadata.gz: 8f5aaa06960399af8c0db1b659792fbe07b64e8b
+  data.tar.gz: 3d719dd5b2d8fb8d587a6253e97495847240386b
 SHA512:
-  metadata.gz: c59f72eac8f078a362092ba2ddbebfe52cd28894a4bb772f8782c76b8f95d9e65905fa6493cd18456f478a8ce7cd03bd59f93123569e8ba396ced3c0e3a36657
-  data.tar.gz: 89968e0ddd67d52b3f083c8f0bcca07807f6bb3d983b59068888e9ef7e80097d056fcd1f4d6ad3c59422694634c7e5a8a6cb1c2dd372cbc3b39e137b5a539ef6
+  metadata.gz: af6e9a5b261f683988c5287ffd7009219ee32731d8113de0b8a19460028c5cc15d60b470972a28ef94266bb1e927f18845ecebc1fda8ae01bb36d7b9eec4ee26
+  data.tar.gz: 9b970c33412b8524e5a3422293e8939875056c5c4def588f3091d404c39c957307b796a5d032cf5c0b58d522ef2471f06de00394e731825637472286b38f3af5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.0.3 (2015/03/25)
+
+Changes:
+
+* fluent-plugin-irc v0.0.7 has been released. Use it.
+
 # 0.0.2 (2015/03/23)
 
 Enhancements:

data/README.md

@@ -74,7 +74,7 @@ See [config-file](http://docs.fluentd.org/articles/config-file) documentation of
 See following pages for built-in plugins.
 
 * [in_daioikachan](./README/in_daioikachan.md)
-* [fluent-plugin-irc](./README/out_irc.md)
+* [fluent-plugin-irc](https://github.com/choplin/fluent-plugin-irc)
 * [fluent-plugin-slack](https://github.com/sowawa/fluent-plugin-slack)
 
 If you need other backends, search other fluentd output plugins and add them. Enjoy!

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/daioikachan.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "fluentd", "~> 0.12.0"
   gem.add_dependency "dotenv"
   gem.add_dependency "puma"
-  # gem.add_dependency "fluent-plugin-irc"
-  gem.add_dependency "irc_parser"
+  gem.add_dependency "fluent-plugin-irc", ">= 0.0.7"
   gem.add_dependency "fluent-plugin-slack", ">= 0.5.0"
   gem.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daioikachan
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: irc_parser
+  name: fluent-plugin-irc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: fluent-plugin-slack
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,6 @@ files:
 - LICENSE
 - README.md
 - README/in_daioikachan.md
-- README/out_irc.md
 - Rakefile
 - VERSION
 - bin/daioikachan
@@ -116,7 +115,6 @@ files:
 - examples/example.conf
 - examples/multi_slack.conf
 - lib/fluent/plugin/in_daioikachan.rb
-- lib/fluent/plugin/out_irc.rb
 - test/helper.rb
 - test/plugin/test_in_daioikachan.rb
 homepage: https://github.com/sonots/daioikachan

data/README/out_irc.md

@@ -1,58 +0,0 @@
-# Fluent::Plugin::Irc, a plugin for [Fluentd](http://fluentd.org)
-
-[![Build Status](https://travis-ci.org/choplin/fluent-plugin-irc.svg)](https://travis-ci.org/choplin/fluent-plugin-irc)
-
-Fluent plugin to send messages to IRC server
-
-## Installation
-
-`$ fluent-gem install fluent-plugin-irc`
-
-## Configuration
-
-### Example
-
-```
-<match **>
-  type irc
-  host localhost
-  port 6667
-  channel fluentd
-  nick fluentd
-  user fluentd
-  real fluentd
-  message notice: %s [%s] %s
-  out_keys tag,time,message
-  time_key time
-  time_format %Y/%m/%d %H:%M:%S
-  tag_key tag
-</match>
-```
-
-### Parameter
-
-|parameter|description|default|
-|---|---|---|
-|host|IRC server host|localhost|
-|port|IRC server port number|6667|
-|channel|channel to send messages (without first '#')||
-|channel_keys|keys used to format channel. %s will be replaced with value specified by channel_keys if this option is used|nil|
-|nick|nickname registerd of IRC|fluentd|
-|user|user name registerd of IRC|fluentd|
-|real|real name registerd of IRC|fluentd|
-|message|message format. %s will be replaced with value specified by out_keys||
-|out_keys|keys used to format messages||
-|time_key|key name for time|time|
-|time_format|time format. This will be formatted with Time#strftime.|%Y/%m/%d %H:%M:%S|
-|tag_key|key name for tag|tag|
-|command|irc command. `privmsg` or `notice`|privmsg|
-|command_keys|keys used to format command. %s will be replaced with value specified by command_keys if this option is used|nil|
-|send_interval|interval (sec) to send message. defence Excess Flood|2|
-|max_send_queue|maximum size of send message queue|100|
-
-## Copyright
-
-<table>
-<tr><td>Copyright</td><td>Copyright (c) 2015 OKUNO Akihiro</td></tr>
-<tr><td>License</td><td>Apache License, Version 2.0</td></tr>
-</table>

data/lib/fluent/plugin/out_irc.rb

@@ -1,292 +0,0 @@
-module Fluent
-  class IRCOutput < Fluent::Output
-    Fluent::Plugin.register_output('irc', self)
-
-    include SetTimeKeyMixin
-    include SetTagKeyMixin
-
-    config_set_default :include_time_key, true
-    config_set_default :include_tag_key, true
-
-    config_param :host        , :string  , :default => 'localhost'
-    config_param :port        , :integer , :default => 6667
-    config_param :channel     , :string
-    config_param :channel_keys, :default => nil do |val|
-      val.split(',')
-    end
-    config_param :nick        , :string  , :default => 'fluentd'
-    config_param :user        , :string  , :default => 'fluentd'
-    config_param :real        , :string  , :default => 'fluentd'
-    config_param :password    , :string  , :default => nil
-    config_param :message     , :string
-    config_param :out_keys do |val|
-      val.split(',')
-    end
-    config_param :time_key    , :string  , :default => 'time'
-    config_param :time_format , :string  , :default => '%Y/%m/%d %H:%M:%S'
-    config_param :tag_key     , :string  , :default => 'tag'
-    config_param :command     , :string  , :default => 'privmsg'
-    config_param :command_keys, :default => nil do |val|
-      val.split(',')
-    end
-
-    config_param :blocking_timeout, :time,    :default => 0.5
-    config_param :max_send_queue,   :integer, :default => 100
-    config_param :send_interval,    :time,    :default => 2
-
-    COMMAND_MAP = {
-      'priv_msg' => :priv_msg,
-      'privmsg'  => :priv_msg,
-      'notice'   => :notice,
-    }
-
-    # To support log_level option implemented by Fluentd v0.10.43
-    unless method_defined?(:log)
-      define_method("log") { $log }
-    end
-
-    attr_reader :conn # for test
-
-    def initialize
-      super
-      require 'irc_parser'
-    end
-
-    def configure(conf)
-      super
-
-      begin
-        @message % (['1'] * @out_keys.length)
-      rescue ArgumentError
-        raise Fluent::ConfigError, "string specifier '%s' and out_keys specification mismatch"
-      end
-
-      if @channel_keys
-        begin
-          @channel % (['1'] * @channel_keys.length)
-        rescue ArgumentError
-          raise Fluent::ConfigError, "string specifier '%s' and channel_keys specification mismatch"
-        end
-      end
-      @channel = '#'+@channel
-
-      if @command_keys
-        begin
-          @command % (['1'] * @command_keys.length)
-        rescue ArgumentError
-          raise Fluent::ConfigError, "string specifier '%s' and command_keys specification mismatch"
-        end
-      else
-        unless @command = COMMAND_MAP[@command]
-          raise Fluent::ConfigError, "command must be one of #{COMMAND_MAP.keys.join(', ')}"
-        end
-      end
-
-      @send_queue = []
-    end
-
-    def start
-      super
-
-      begin
-        @loop = Coolio::Loop.new
-        @conn = create_connection
-        @timer = TimerWatcher.new(@send_interval, true, log, &method(:on_timer))
-        @loop.attach(@timer)
-        @thread = Thread.new(&method(:run))
-      rescue => e
-        puts e
-        raise Fluent::ConfigError, "failed to connect IRC server #{@host}:#{@port}"
-      end
-    end
-
-    def shutdown
-      super
-      @loop.watchers.each { |w| w.detach }
-      @loop.stop
-      @conn.close
-      @thread.join
-    end
-
-    def run
-      @loop.run(@blocking_timeout)
-    rescue => e
-      log.error "unexpected error", :error => e, :error_class => e.class
-      log.error_backtrace
-    end
-
-    def emit(tag, es, chain)
-      chain.next
-
-      if @conn.closed?
-        log.warn "out_irc: connection is closed. try to reconnect"
-        @conn = create_connection
-      end
-
-      es.each do |time,record|
-        if @send_queue.size >= @max_send_queue
-          log.warn "out_irc: send queue size exceeded max_send_queue(#{@max_send_queue}), discards"
-          break
-        end
-
-        filter_record(tag, time, record)
-        command, channel, message = build_command(record), build_channel(record), build_message(record)
-        log.debug { "out_irc: push {command:\"#{command}\", channel:\"#{channel}\", message:\"#{message}\"}" }
-        @send_queue.push([command, channel, message])
-      end
-    end
-
-    def on_timer
-      return if @send_queue.empty?
-      command, channel, message = @send_queue.shift
-      log.info { "out_irc: send {command:\"#{command}\", channel:\"#{channel}\", message:\"#{message}\"}" }
-      @conn.send_message(command, channel, message)
-    end
-
-    private
-
-    def create_connection
-      conn = IRCConnection.connect(@host, @port)
-      conn.log  = log
-      conn.nick = @nick
-      conn.user = @user
-      conn.real = @real
-      conn.password = @password
-      conn.attach(@loop)
-      conn
-    end
-
-    def build_message(record)
-      values = fetch_keys(record, @out_keys)
-      @message % values
-    end
-
-    def build_channel(record)
-      return @channel unless @channel_keys
-
-      values = fetch_keys(record, @channel_keys)
-      @channel % values
-    end
-
-    def build_command(record)
-      return @command unless @command_keys
-
-      values = fetch_keys(record, @command_keys)
-      unless command = COMMAND_MAP[@command % values]
-        log.warn "out_irc: command is not one of #{COMMAND_MAP.keys.join(', ')}, use privmsg"
-      end
-      command || :priv_msg
-    end
-
-    def fetch_keys(record, keys)
-      Array(keys).map do |key|
-        begin
-          record.fetch(key).to_s
-        rescue KeyError
-          log.warn "out_irc: the specified key '#{key}' not found in record. [#{record}]"
-          ''
-        end
-      end
-    end
-
-    class TimerWatcher < Coolio::TimerWatcher
-      def initialize(interval, repeat, log, &callback)
-        @callback = callback
-        @log = log
-        super(interval, repeat)
-      end
-
-      def on_timer
-        @callback.call
-      rescue
-        @log.error $!.to_s
-        @log.error_backtrace
-      end
-    end
-
-    class IRCConnection < Cool.io::TCPSocket
-      attr_reader :joined # for test
-      attr_accessor :log, :nick, :user, :real, :password
-
-      def initialize(*args)
-        super
-        @joined = {}
-      end
-
-      def on_connect
-        if @password
-          IRCParser.message(:pass) do |m|
-            m.password = @password
-            write m
-          end
-        end
-        IRCParser.message(:nick) do |m|
-          m.nick   = @nick
-          write m
-        end
-        IRCParser.message(:user) do |m|
-          m.user = @user
-          m.postfix = @real
-          write m
-        end
-      end
-
-      def on_read(data)
-        err_nick_name_in_use = nil
-        data.each_line do |line|
-          begin
-            msg = IRCParser.parse(line)
-            log.debug { "out_irc: on_read :#{msg.class.to_sym}" }
-            case msg.class.to_sym
-            when :rpl_welcome
-              log.info { "out_irc: welcome \"#{msg.nick}\" to \"#{msg.prefix}\"" }
-            when :ping
-              IRCParser.message(:pong) do |m|
-                m.target = msg.target
-                m.body = msg.body
-                write m
-              end
-            when :join
-              log.info { "out_irc: joined to #{msg.channels.join(', ')}" }
-              msg.channels.each {|channel| @joined[channel] = true }
-            when :err_nick_name_in_use
-              log.warn "out_irc: nickname \"#{msg.error_nick}\" is already in use. use \"#{msg.error_nick}_\" instead."
-              err_nick_name_in_use = true
-              @nick = "#{msg.error_nick}_"
-            when :error
-              log.warn "out_irc: an error occured. \"#{msg.error_message}\""
-            end
-          rescue
-            #TODO
-          end
-        end
-
-        if err_nick_name_in_use
-          self.on_connect
-        end
-      end
-
-      def joined?(channel)
-        @joined[channel]
-      end
-
-      def join(channel)
-        IRCParser.message(:join) do |m|
-          m.channels = channel
-          write m
-        end
-        log.debug { "out_irc: join to #{channel}" }
-      end
-
-      def send_message(command, channel, message)
-        join(channel) unless joined?(channel)
-        IRCParser.message(command) do |m|
-          m.target = channel
-          m.body = message
-          write m
-        end
-        channel # return channel for test
-      end
-    end
-  end
-end