fluent-plugin-slack 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e77ab7baa0827ff765699dcc93878a07fb4b672
-  data.tar.gz: 69e2477beb5f8e394493b773f14ba92430927750
+  metadata.gz: 401cd80a470edd2acf64f3530ee125df42fa9393
+  data.tar.gz: 3c4238b53bf9ded7336eaf4148e572f1b18a9cc9
 SHA512:
-  metadata.gz: 2bd4b7b25d6a3c63bca594121120cf29a5679bbcb77e295d9f245ced3a80061458ed1d6028c67cbf0f159ae6cdf13ee190764f84b9ae7d7219507fc275d409f3
-  data.tar.gz: dd44cbe50f10718b5c5dcdc0fba0e0b9d570db7c82b636e200142be75ea8736ad3d8bbc2f885e785654328894be76c4571ac6635f7c2d9c2ed421d6cbe6d6019
+  metadata.gz: bd6b4662dfe23aefb7ebaf856b413e025d09ff0efa43ad75cd764129024a055ac280dfb32d94f5d2771e5d721e4c23d2163fb125776ee4e520f945019b1c017b
+  data.tar.gz: be176edc0387bc6848214744931250aff8b38078ba2b4cd0ac1f7a086b81919b26237d5de446dcd85230a03c0fea4424ff72c0a63aa8117ee35a36227b9d962f

data/.travis.yml

@@ -1,10 +1,15 @@
 sudo: false
 rvm:
-  - 2.0.0
+  - 2.0.*
   - 2.1.*
   - 2.2.*
   - 2.3.0
 gemfile:
   - Gemfile
+  - Gemfile.fluentd.0.12
+matrix:
+  exclude:
+    - rvm: 2.0.*
+      gemfile: Gemfile
 before_install:
   - gem update bundler

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.6.4 (2016/07/07)
+
+Enhancements:
+
+* Add `as_user` option (thanks @yacchin1205)
+
 ## 0.6.3 (2016/05/11)
 
 Enhancements:

data/Gemfile.fluentd.0.12

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gemspec
+gem 'fluentd', '~> 0.12.0'

data/README.md

@@ -68,6 +68,7 @@ fluent_logger.post('slack', {
 |webhook_url|Incoming Webhook URI (Required for Incoming Webhook mode). See https://api.slack.com/incoming-webhooks||
 |slackbot_url|Slackbot URI (Required for Slackbot mode). See https://api.slack.com/slackbot. NOTE: most of optional parameters such as `username`, `color`, `icon_emoji`, `icon_url`, and `title` are not available for this mode, but Desktop Notification via Highlight Words works with only this mode||
 |token|Token for Web API (Required for Web API mode). See https://api.slack.com/web||
+|as_user|post messages as a bot user. See https://api.slack.com/bot-users#post_messages_and_react_to_users. NOTE: This parameter is only enabled if you use the Web API with your bot token. You cannot use both of `username` and `icon_emoji`(`icon_url`) when you set this parameter to `true`.|nil|
 |username|name of bot|nil|
 |color|color to use such as `good` or `bad`. See `Color` section of https://api.slack.com/docs/attachments. NOTE: This parameter must **not** be specified to receive Desktop Notification via Mentions in cases of Incoming Webhook and Slack Web API|nil|
 |icon_emoji|emoji to use as the icon. either of `icon_emoji` or `icon_url` can be specified|nil|

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/lib/fluent/plugin/out_slack.rb

@@ -48,6 +48,13 @@ DESC
     desc <<-DESC
 Emoji to use as the icon.
 Either of `icon_emoji` or `icon_url` can be specified.
+DESC
+    config_param :as_user,           :bool, default: nil
+    desc <<-DESC
+Post message as the authenticated user.
+NOTE: This parameter is only enabled if you use the Web API with your bot token.
+You cannot use both of `username` and `icon_emoji`(`icon_url`) when
+you set this parameter to `true`.
 DESC
     config_param :icon_emoji,           :string, default: nil
     desc <<-DESC
@@ -133,6 +140,9 @@ DESC
         if @webhook_url.empty?
           raise Fluent::ConfigError.new("`webhook_url` is an empty string")
         end
+        unless @as_user.nil?
+          log.warn "out_slack: `as_user` parameter are not available for Incoming Webhook"
+        end
         @slack = Fluent::SlackClient::IncomingWebhook.new(@webhook_url)
       elsif @slackbot_url
         if @slackbot_url.empty?
@@ -141,6 +151,9 @@ DESC
         if @username or @color or @icon_emoji or @icon_url
           log.warn "out_slack: `username`, `color`, `icon_emoji`, `icon_url` parameters are not available for Slackbot Remote Control"
         end
+        unless @as_user.nil?
+          log.warn "out_slack: `as_user` parameter are not available for Slackbot Remote Control"
+        end
         @slack = Fluent::SlackClient::Slackbot.new(@slackbot_url)
       elsif @token
         if @token.empty?
@@ -183,6 +196,10 @@ DESC
         raise Fluent::ConfigError, "either of `icon_emoji` or `icon_url` can be specified"
       end
 
+      if @as_user and (@icon_emoji or @icon_url or @username)
+        raise Fluent::ConfigError, "`username`, `icon_emoji` and `icon_url` cannot be specified when `as_user` is set to true"
+      end
+
       if @mrkdwn
         # Enable markdown for attachments. See https://api.slack.com/docs/formatting
         @mrkdwn_in = %w[text fields]
@@ -232,6 +249,7 @@ DESC
     def common_payload
       return @common_payload if @common_payload
       @common_payload = {}
+      @common_payload[:as_user]    = @as_user    unless @as_user.nil?
       @common_payload[:username]   = @username   if @username
       @common_payload[:icon_emoji] = @icon_emoji if @icon_emoji
       @common_payload[:icon_url]   = @icon_url   if @icon_url

data/test/test_helper.rb

@@ -9,6 +9,7 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'test/unit'
+require 'test/unit/rr'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -29,5 +30,3 @@ def with_timezone(tz)
 ensure
   ENV['TZ'] = oldtz
 end
-
-require 'rr'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-slack
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Keisuke SOGAWA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -135,6 +135,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.fluentd.0.12
 - README.md
 - Rakefile
 - VERSION