fluent-plugin-slack 0.1.1 → 0.2.0

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-gem "simplecov", :require => false

data/Rakefile

@@ -1,17 +1,11 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 
 require 'rake/testtask'
-
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.test_files = FileList['test/plugin/*.rb']
+  test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-task :coverage do |t|
-  ENV['SIMPLE_COV'] = '1'
-  Rake::Task["test"].invoke
-end
-
-task :default => [:build]
+task :default => :test

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/fluent-plugin-slack.gemspec

@@ -16,12 +16,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency "fluentd", ">= 0.10.8"
-  gem.add_dependency "slackr",  ">= 0.0.2"
-  gem.add_dependency "activesupport", ">=3.2.16"
+  gem.add_dependency "activesupport", "~>3.2.0"
   gem.add_dependency "tzinfo", ">=0.3.38"
 
-  gem.add_development_dependency "rake", ">= 0.9.2"
-  gem.add_development_dependency "simplecov", ">= 0.5.4"
+  gem.add_development_dependency "rake", ">= 10.1.1"
   gem.add_development_dependency "rr", ">= 1.0.0"
   gem.add_development_dependency "pry"
+  gem.add_development_dependency("minitest", ["~> 4.0"])
 end

data/lib/fluent/plugin/out_buffered_slack.rb

@@ -1,4 +1,5 @@
 module Fluent
+  class BufferedSlackOutputError < StandardError; end
   class BufferedSlackOutput < Fluent::TimeSlicedOutput
     Fluent::Plugin.register_output('buffered_slack', self)
     config_param :api_key,    :string
@@ -21,42 +22,56 @@ module Fluent
         messages[tag] = '' if messages[tag].nil?
         messages[tag] << "[#{Time.at(time).in_time_zone(@timezone)}] #{record['message']}\n"
       end
-      messages.each do |tag, value|
-        field = {
-          title: tag,
-          value: value
-        }
-        begin
-          @slack.say(
-            nil,
-            { channel:     @channel,
-              username:    @username,
-              icon_emoji:  @icon_emoji,
-              attachments: [{
-                fallback: tag,
-                color:    @color,
-                fields:   [ field ]
-              }]})
-        rescue => e
-            $log.error("Slack Error: #{e.backtrace[0]} / #{e.message}")
-        end
+      begin
+        payload = {
+          channel:      @channel,
+            username:   @username,
+            icon_emoji: @icon_emoji,
+            attachments: [{
+              fallback: messages.keys.join(','),
+              color:    @color,
+              fields:   messages.map{|k,v| {title: k, value: v} }
+            }]}
+        post_request(
+          payload: payload.to_json
+        )
+      rescue => e
+        $log.error("Slack Error: #{e.backtrace[0]} / #{e.message}")
       end
     end
 
     def initialize
       super
       require 'active_support/time'
-      require 'slackr'
+      require 'uri'
+      require 'net/http'
     end
 
     def configure(conf)
       super
-      @slack    = Slackr::Webhook.new(conf['team'], conf['api_key'])
-      @channel  = conf['channel']
+      @channel  = URI.unescape(conf['channel'])
       @username = conf['username'] || 'fluentd'
       @color    = conf['color'] || 'good'
       @icon_emoji = conf['icon_emoji'] || ':question:'
-      @timezone = conf['timezone'] || 'UTC'
+      @timezone   = conf['timezone'] || 'UTC'
+      @team       = conf['team']
+      @api_key    = conf['api_key']
+    end
+
+    private
+    def endpoint
+      URI.parse "https://#{@team}.slack.com/services/hooks/incoming-webhook?token=#{@api_key}"
+    end
+
+    def post_request(data)
+      req = Net::HTTP::Post.new endpoint.request_uri
+      req.set_form_data(data)
+      http = Net::HTTP.new endpoint.host, endpoint.port
+      http.use_ssl = (endpoint.scheme == "https")
+      res = http.request(req)
+      if res.code != "200"
+        raise BufferedSlackOutputError, "Slack.com - #{res.code} - #{res.body}"
+      end
     end
   end
 end

data/test/plugin/{out_buffered_slack.rb → test_out_buffered_slack.rb}

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'fluent/plugin/out_buffered_slack'
 require 'time'
 
 class BufferedSlackOutputTest < Test::Unit::TestCase
@@ -31,7 +30,7 @@ class BufferedSlackOutputTest < Test::Unit::TestCase
     d = create_driver
     time = Time.parse("2014-01-01 22:00:00 UTC").to_i
     d.tag = 'test'
-    stub(d.instance.slack).say(
+    stub(d.instance.slack).ping(
       nil,
       channel:    '%23test',
       username:   'testuser',
@@ -53,7 +52,7 @@ class BufferedSlackOutputTest < Test::Unit::TestCase
     d = create_driver
     time = Time.parse("2014-01-01 22:00:00 UTC").to_i
     d.tag  = 'test'
-    stub(d.instance.slack).say(
+    stub(d.instance.slack).ping(
       nil,
       channel:    '%23test',
       username:   'testuser',

data/test/test_helper.rb

@@ -1,20 +1,27 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rubygems'
+require 'bundler'
 
-require 'rr'
-require 'test/unit'
-class Test::Unit::TestCase
-  include RR::Adapters::TestUnit
+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 'test/unit'
 
-if ENV['SIMPLE_COV']
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter 'test/'
-    add_filter 'pkg/'
-    add_filter 'vendor/'
-  end
+$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 'test/unit'
-require 'fluent/test'
+require 'fluent/plugin/out_buffered_slack'
+require 'rr'

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-slack
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Keisuke SOGAWA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,41 +22,31 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.10.8
-- !ruby/object:Gem::Dependency
-  name: slackr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.16
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,59 +62,67 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.1.1
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: rr
+  name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 description: fluent Slack plugin
 email: keisuke.sogawa@gmail.com
 executables: []
@@ -136,31 +137,32 @@ files:
 - VERSION
 - fluent-plugin-slack.gemspec
 - lib/fluent/plugin/out_buffered_slack.rb
-- test/plugin/out_buffered_slack.rb
+- test/plugin/test_out_buffered_slack.rb
 - test/test_helper.rb
 homepage: https://github.com/sowawa/fluent-plugin-slack
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: fluent Slack plugin
 test_files:
-- test/plugin/out_buffered_slack.rb
+- test/plugin/test_out_buffered_slack.rb
 - test/test_helper.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzAwOGJlODQ1MzNhY2U5ZWZlYjg5YzdiYTQzZTdlNDA3NzRmNWQ0OQ==
-  data.tar.gz: !binary |-
-    MmNhMzBjM2Y5YThhMWU0YWY1NmVmNDQ0NTA5YjMxNGQzZTcyNDk4OA==
-SHA512:
-  metadata.gz: !binary |-
-    YTUxZmExNjYwOGRhNTY1N2I2NWNjNjc4NTgzZjA2NTFkZTNhM2I4Yzg0NjFh
-    YThhZjE1MmZhOWRjNDFiYzhhZjIxMzRjNjUzNDAwZGM5YWQxOWRhZjJmMGNj
-    YjFlMDJhNzY3MjdhZWUxOWJhM2VhODk2NTgzYjI5ZWQ2NTExMjU=
-  data.tar.gz: !binary |-
-    ZjhjODFiMDdkYjBjZTI2YmM5ZDdhYWEwMzBhNzg1ZDEyMmZjYjgwMzlkY2Jj
-    ZmUyZWFkYTU0YWU1ZDVhYzRlNjc2OTU5MGUyNjNhZDJiNThmYWE1YmM2ZWMz
-    M2Q1ZDA2OGM1ODg2YWQ1MDliMzhmZDAxYWUxMDNhZDYyOGNjN2Q=