fluent-plugin-mail 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bff3b6a307b6aeb3172ef9049d1346f6efb08b4
-  data.tar.gz: edb540a400e7aadd0e335ed10aa2414f7786678e
+  metadata.gz: f383ef142caab20f8176e6c38e7cf774ed5d1a4d
+  data.tar.gz: a5006e52c3e4a0fde6b7c713f245fdf44b5b07c9
 SHA512:
-  metadata.gz: b4cecfcb8546c6862be3065d2f76ca085ec4590779a199913f635c51610865721800529f0144e9906220c213295d027f5c77b4c6f345cfeff7a7d607c5ba449c
-  data.tar.gz: 726943b2fec5b731ee109c7ca4e7911d87f8f94e3ff8a8ab74343ad75fb4337509d2ed3497560067039e8b978f29fc38718c3862e9e114ecf6cc860c67ce92d9
+  metadata.gz: 81aca182ab3d260cbea3f57294a648770a22278d5fa525f69be6eb4448b1df75646faea58e7b3a1c77d100042314cae6a308cd1a9b1964c48e3e0414d8578a3c
+  data.tar.gz: d412c15b6df8914e240b7491e5085b45031a5aaca8de4012d8d3833be7f442480545bfbd17b68fd81ae10e465b6a7e6d735ed9286e93b4fe3fe758d583dd629a

data/.travis.yml

@@ -6,3 +6,5 @@ rvm:
 gemfile:
   - Gemfile
   - Gemfile.fluentd.lt.0.12
+
+before_install: gem update bundler

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.2.3
+
+Enhancements:
+
+* Add content_type option (thanks to okkez)
+* Support desc if it is available. see http://qiita.com/repeatedly/items/bce628ba75b442424bcf (thanks to okkez)
+
 # 0.2.2
 
 Enhancements:

data/fluent-plugin-mail.gemspec

@@ -12,7 +12,8 @@ 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.2'
+  gem.version       = '0.2.3'
+  gem.license       = "Apache-2.0"
 
   gem.add_runtime_dependency "fluentd"
   gem.add_runtime_dependency "string-scrub" if RUBY_VERSION.to_f < 2.1

data/lib/fluent/plugin/out_mail.rb

@@ -8,32 +8,62 @@ class Fluent::MailOutput < Fluent::Output
     define_method("log") { $log }
   end
 
+  # For fluentd v0.12.16 or earlier
+  class << self
+    unless method_defined?(:desc)
+      def desc(description)
+      end
+    end
+  end
+
+  desc "Output comma delimited keys"
   config_param :out_keys,             :string,  :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 => ""
+  desc "Identify the timestamp of the record"
   config_param :time_key,             :string,  :default => nil
+  desc "Identify the tag of the record"
   config_param :tag_key,              :string,  :default => 'tag'
+  desc "SMTP server hostname"
   config_param :host,                 :string
+  desc "SMTP server port number"
   config_param :port,                 :integer, :default => 25
+  desc "HELO domain"
   config_param :domain,               :string,  :default => 'localdomain'
+  desc "User for SMTP Auth"
   config_param :user,                 :string,  :default => nil
+  desc "Password for SMTP Auth"
   config_param :password,             :string,  :default => nil, :secret => true
+  desc "MAIL FROM this value"
   config_param :from,                 :string,  :default => 'localhost@localdomain'
+  desc "Mail destination (To)"
   config_param :to,                   :string,  :default => ''
+  desc "Mail destination (Cc)"
   config_param :cc,                   :string,  :default => ''
+  desc "Mail destination (BCc)"
   config_param :bcc,                  :string,  :default => ''
+  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 => ""
+  desc "If set to true, enable STARTTLS"
   config_param :enable_starttls_auto, :bool,    :default => false
+  desc "If set to true, enable TLS"
   config_param :enable_tls,           :bool,    :default => false
+  desc "Format string to parse time"
   config_param :time_format,          :string,  :default => "%F %T %z"
+  desc "Use local time or not"
   config_param :localtime,            :bool,    :default => true
+  desc "Locale of time"
   config_param :time_locale,                    :default => nil
+  desc "Specify Content-Type"
+  config_param :content_type,         :string,  :default => "text/plain; charset=utf-8"
 
   def initialize
     super
     require 'net/smtp'
-    require 'kconv'
     require 'string/scrub' if RUBY_VERSION.to_f < 2.1
   end
 
@@ -179,7 +209,7 @@ Bcc: #{@bcc}
 Subject: #{subject}
 Message-Id: #{mid}
 Mime-Version: 1.0
-Content-Type: text/plain; charset=utf-8
+Content-Type: #{@content_type}
 
 #{body}
 EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mail
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Yuichi UEMURA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -75,7 +75,8 @@ files:
 - test/helper.rb
 - test/plugin/test_out_mail.rb
 homepage: https://github.com/u-ichi/fluent-plugin-mail
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-mail
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: output plugin for Mail