fluent-plugin-mail 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce1428de5b8be38c7464d257acd907a57384eb7d
-  data.tar.gz: fed5e53b42c11b651559518f9680dde038b3c575
+  metadata.gz: bbf7a4f07a3e3bd983e19393c26f3308b09116b3
+  data.tar.gz: 97507f52cb2bf02faaf11f542956f2c83771028a
 SHA512:
-  metadata.gz: cd49b7942e142649291f7b33cdaff7e6d0bae71aa49d875b270ae3d0dd03c0b69d6769186ae5b66089a39c38476e90e60c0d4879c97929c681a8e5e340139cac
-  data.tar.gz: 3d4281ab00c49b97a49ec2000d8a3e7aecf3e83fed8a3163a331cc481b82458ddd3c95648696e248f0b9e919738793c57e19766d5d2e044c861467d589bb4dca
+  metadata.gz: ff14ea2b467ba371e6e86adc877a10e556db2f57a98511dec4677663e57108d1d1dbbaf6317c41d014344b8880b9c876aaaf19ed408f2d69cb9f28ae3f2ba4c2
+  data.tar.gz: 75f25d97a627d38818119f93c8d23f2b0813364626c7b5db475ea84310ca92f735c8a3c521cacd12f3a4a7764a62118ee3ea644824668c9119f9a90b342add54

data/.travis.yml

@@ -4,5 +4,5 @@ rvm:
   - 2.4.*
 gemfile:
   - Gemfile
-  - Gemfile.fluentd.lt.0.12
+  - Gemfile.0.12
 before_install: gem update bundler

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.3.0 (2017-11-25)
+
+Changes:
+
+* Drop Fluentd v0.10 support
+* Use array type for array like parameters (thanks to @cosmo0920)
+
 # 0.2.5 (2017-11-25)
 
 Enhancements:

data/{Gemfile.fluentd.lt.0.12 → Gemfile.0.12}

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
-gem 'fluentd', '~> 0.10.43'
 gemspec
+gem 'fluentd', '~> 0.12.0'

data/fluent-plugin-mail.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-mail"
   gem.require_paths = ["lib"]
-  gem.version       = '0.2.5'
+  gem.version       = '0.3.0'
   gem.license       = "Apache-2.0"
 
-  gem.add_runtime_dependency "fluentd"
+  gem.add_runtime_dependency "fluentd", '>= 0.12.0'
   gem.add_runtime_dependency "string-scrub" if RUBY_VERSION.to_f < 2.1
   gem.add_development_dependency "rake"
   gem.add_development_dependency "test-unit"

data/lib/fluent/plugin/out_mail.rb

@@ -17,11 +17,11 @@ class Fluent::MailOutput < Fluent::Output
   end
 
   desc "Output comma delimited keys"
-  config_param :out_keys,             :string,  :default => ""
+  config_param :out_keys,             :array,  :default => []
   desc "Format string to construct message body"
   config_param :message,              :string,  :default => nil
   desc "Specify comma delimited keys output to `message`"
-  config_param :message_out_keys,     :string,  :default => ""
+  config_param :message_out_keys,     :array,  :default => []
   desc "Identify the timestamp of the record"
   config_param :time_key,             :string,  :default => nil
   desc "Identify the tag of the record"
@@ -55,7 +55,7 @@ class Fluent::MailOutput < Fluent::Output
   desc "Format string to construct mail subject"
   config_param :subject,              :string,  :default => 'Fluent::MailOutput plugin'
   desc "Specify comma delimited keys output to `subject`"
-  config_param :subject_out_keys,     :string,  :default => ""
+  config_param :subject_out_keys,     :array,  :default => []
   desc "If set to true, enable STARTTLS"
   config_param :enable_starttls_auto, :bool,    :default => false
   desc "If set to true, enable TLS"
@@ -78,10 +78,6 @@ class Fluent::MailOutput < Fluent::Output
   def configure(conf)
     super
 
-    @out_keys = @out_keys.split(',')
-    @message_out_keys = @message_out_keys.split(',')
-    @subject_out_keys = @subject_out_keys.split(',')
-
     if @out_keys.empty? and @message.nil?
       raise Fluent::ConfigError, "Either 'message' or 'out_keys' must be specifed."
     end

data/test/plugin/test_out_mail.rb

@@ -60,6 +60,19 @@ class MailOutputTest < Test::Unit::TestCase
     cc_key cc
     bcc_key bcc
   ]
+  CONFIG_KEYS_WITH_WHITESPACES = %[
+    out_keys tag,time, value
+    time_key time
+    time_format %Y/%m/%d %H:%M:%S
+    tag_key tag
+    message_out_keys msg, log_level
+    subject Fluentd Notification Alarm %s
+    subject_out_keys tag, content_id
+    host localhost
+    port 25
+    from localhost@localdomain
+    to localhost@localdomain
+  ]
 
   def create_driver(conf=CONFIG_OUT_KEYS,tag='test')
     Fluent::Test::OutputTestDriver.new(Fluent::MailOutput, tag).configure(conf)
@@ -68,10 +81,18 @@ class MailOutputTest < Test::Unit::TestCase
   def test_configure
     d = create_driver(CONFIG_OUT_KEYS)
     assert_equal 'localhost', d.instance.host
+    assert_equal ['tag', 'time', 'value'], d.instance.out_keys
     d = create_driver(CONFIG_CC_BCC)
     assert_equal 'localhost', d.instance.host
+    assert_equal ['tag', 'time', 'value'], d.instance.out_keys
     d = create_driver(CONFIG_MESSAGE)
     assert_equal 'localhost', d.instance.host
+    assert_equal ['tag', 'time', 'value'], d.instance.message_out_keys
+    d = create_driver(CONFIG_KEYS_WITH_WHITESPACES)
+    assert_equal 'localhost', d.instance.host
+    assert_equal ['tag', 'time', 'value'], d.instance.out_keys
+    assert_equal ['tag', 'content_id'], d.instance.subject_out_keys
+    assert_equal ['msg', 'log_level'], d.instance.message_out_keys
   end
 
   def test_out_keys

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mail
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Yuichi UEMURA
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -65,7 +65,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.fluentd.lt.0.12
+- Gemfile.0.12
 - LICENSE
 - README.md
 - Rakefile