logstash-output-email 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fa892c4a77d91ac488d37637d73bde950a3ddbd
-  data.tar.gz: 8f4924f2abcbb340e2aeb34e9c6a8903ea3e766e
+  metadata.gz: f085459b9db87c0c9c6eb079defba873911eb464
+  data.tar.gz: fe56329e0b007e861e1739ced41fda3902d943bb
 SHA512:
-  metadata.gz: d72af0c27f66b0e2d691ce9966b2f1961223088c9b2cf88ec712c3e67a8b068cb628563f3bb6e83ccc7708ee886cd3584ecee908648f6137022a2783d5791a56
-  data.tar.gz: f1b88abbc7f6b9e20705fdfc0329e54d6ce9765367539dba9d6d9e5d12ac13350c749f85def5377c92a97864bf3f5f1f82900c16052cfd50bdc270b2cd162eaa
+  metadata.gz: c7dac18b32d606fe333c64947d60189cb6ef908aebc24c90eb3d05592c1a3a8d41885f86f5b28bcc9db8864c2e6a99a3a335d5c3181c3a944747eb8ade5d7c12
+  data.tar.gz: 8f0e5ac3ee3874a59368cf8c4f023441bdaf62b684c481cec7bf71c14353373a047a3009864f77ccecb86ee08988f4976694bafb21933131ee62c4af6906c043

data/logstash-output-email.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-email'
-  s.version         = '0.1.4'
+  s.version         = '0.1.5'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Send email when an output is received."
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -26,5 +26,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'rumbster'
+  s.add_development_dependency 'logstash-input-generator'
+
 end
 

data/spec/outputs/email_spec.rb

@@ -1,173 +1,94 @@
-require "logstash/devutils/rspec/spec_helper"
+# encoding: utf-8
+require "spec_helper"
 require "rumbster"
 require "message_observers"
 
-describe "outputs/email", :broken => true do
-    
+describe "outputs/email" do
 
-    port = 2525
-    let (:rumbster) { Rumbster.new(port) }
-    let (:message_observer) { MailMessageObserver.new }
+  port = 2525
+  let (:rumbster) { Rumbster.new(port) }
+  let (:message_observer) { MailMessageObserver.new }
+  plugin = LogStash::Plugin.lookup("output", "email")
 
-    before :each do
-        rumbster.add_observer message_observer
-        rumbster.start
-    end
 
-    after :each do
-        rumbster.stop
-    end
+  before :each do
+    rumbster.add_observer message_observer
+    rumbster.start
+  end
 
-    describe  "use a list of email as mail.to (LOGSTASH-827)" do
-        config <<-CONFIG
-        input {
-            generator {
-                message => "hello world"
-                count => 1
-                type => "generator"
-            }
-        }
-        filter {
-            noop {
-                add_field => ["dummy_match", "ok"]
-            }
-        }
-        output{
-            email {
-                to => "email1@host, email2@host"
-                match => ["mymatch", "dummy_match,ok"]
-                options => ["port", #{port}]
-            }
-        }
-        CONFIG
+  after :each do
+    rumbster.stop
+  end
 
-        agent do
-            insist {message_observer.messages.size} == 1
-            insist {message_observer.messages[0].to} == ["email1@host", "email2@host"]
-        end
-    end
+  describe  "use a list of email as mail.to (LOGSTASH-827)" do
 
-    describe  "use an array of email as mail.to (LOGSTASH-827)" do
-        config <<-CONFIG
-        input {
-            generator {
-                message => "hello world"
-                count => 1
-                type => "generator"
-            }
-        }
-        filter {
-            noop {
-                add_field => ["dummy_match", "ok"]
-                add_field => ["to_addr", "email1@host"]
-                add_field => ["to_addr", "email2@host"]
-            }
-        }
-        output{
-            email {
-                to => "%{to_addr}"
-                match => ["mymatch", "dummy_match,ok"]
-                options => ["port", #{port}]
-            }
-        }
-        CONFIG
-
-        agent do
-            insist {message_observer.messages.size} == 1
-            insist {message_observer.messages[0].to} == ["email1@host", "email2@host"]
-        end
+    it "supports list of emails in to field" do
+      subject = plugin.new("to" => ["email1@host, email2@host"],
+                           "match" => ["mymatch", "dummy_match,ok"],
+                           "options" => ["port", port])
+      subject.register
+      subject.receive(LogStash::Event.new("message" => "hello", "dummy_match" => "ok"))
+      expect(message_observer.messages.size).to eq(1)
+      expect(message_observer.messages[0].to).to eq(["email1@host", "email2@host"])
     end
 
-    describe  "multi-lined text body (LOGSTASH-841)" do
-        config <<-CONFIG
-        input {
-            generator {
-                message => "hello world"
-                count => 1
-                type => "generator"
-            }
-        }
-        filter {
-            noop {
-                add_field => ["dummy_match", "ok"]
-            }
-        }
-        output{
-            email {
-                to => "me@host"
-                subject => "Hello World"
-                body => "Line1\\nLine2\\nLine3"
-                match => ["mymatch", "dummy_match,*"]
-                options => ["port", #{port}]
-            }
-        }
-        CONFIG
-
-        agent do
-            insist {message_observer.messages.size} == 1
-            insist {message_observer.messages[0].subject} == "Hello World"
-            insist {message_observer.messages[0].body.raw_source} == "Line1\r\nLine2\r\nLine3"
-        end
+    it "multiple *to* addresses in a field" do
+      subject = plugin.new("to" => "%{to_addr}",
+                           "match" => ["mymatch", "dummy_match,ok"],
+                           "options" => ["port", port])
+      subject.register
+      subject.receive(LogStash::Event.new("message" => "hello",
+                                          "dummy_match" => "ok",
+                                          "to_addr" => ["email1@host", "email2@host"]))
+      expect(message_observer.messages.size).to eq(1)
+      expect(message_observer.messages[0].to).to eq(["email1@host", "email2@host"])
     end
-
-    describe  "use nil authenticationType (LOGSTASH-559)" do
-        config <<-CONFIG
-        input {
-            generator {
-                message => "hello world"
-                count => 1
-                type => "generator"
-            }
-        }
-        filter {
-            noop {
-                add_field => ["dummy_match", "ok"]
-            }
-        }
-        output{
-            email {
-                to => "me@host"
-                subject => "Hello World"
-                body => "Line1\\nLine2\\nLine3"
-                match => ["mymatch", "dummy_match,*"]
-                options => ["port", #{port}, "authenticationType", "nil"]
-            }
-        }
-        CONFIG
-
-        agent do
-            insist {message_observer.messages.size} == 1
-            insist {message_observer.messages[0].subject} == "Hello World"
-            insist {message_observer.messages[0].body.raw_source} == "Line1\r\nLine2\r\nLine3"
-        end
+  end
+
+  describe  "multi-lined text body (LOGSTASH-841)" do
+    it "handles multiline messages" do
+      subject = plugin.new("to" => "me@host",
+                           "subject" => "Hello World",
+                           "body" => "Line1\\nLine2\\nLine3",
+                           "match" => ["mymatch", "dummy_match,*"],
+                           "options" => ["port", port])
+      subject.register
+      subject.receive(LogStash::Event.new("message" => "hello", "dummy_match" => "ok"))
+      expect(message_observer.messages.size).to eq(1)
+      expect(message_observer.messages[0].subject).to eq("Hello World")
+      expect(message_observer.messages[0].body.raw_source).to eq("Line1\r\nLine2\r\nLine3")
     end
-
-    describe  "match on source and message (LOGSTASH-826)" do
-        config <<-CONFIG
-        input {
-            generator {
-                message => "hello world"
-                count => 1
-                type => "generator"
-            }
-        }
-        output{
-            email {
-                to => "me@host"
-                subject => "Hello World"
-                body => "Mail body"
-                match => ["messageAndSourceMatch", "message,*hello,,and,source,*generator"]
-                options => ["port", #{port}, "authenticationType", "nil"]
-            }
-        }
-        CONFIG
-
-        agent do
-            insist {message_observer.messages.size} == 1
-            insist {message_observer.messages[0].subject} == "Hello World"
-            insist {message_observer.messages[0].body.raw_source} == "Mail body"
-        end
+  end
+
+  describe  "use nil authenticationType (LOGSTASH-559)" do
+    it "reads messages correctly" do
+      subject = plugin.new("to" => "me@host",
+                           "subject" => "Hello World",
+                           "body" => "Line1\\nLine2\\nLine3",
+                           "match" => ["mymatch", "dummy_match,*"],
+                           "options" => ["port", port, "authenticationType", "nil"])
+      subject.register
+      subject.receive(LogStash::Event.new("message" => "hello", "dummy_match" => "ok"))
+      expect(message_observer.messages.size).to eq(1)
+      expect(message_observer.messages[0].subject).to eq("Hello World")
+      expect(message_observer.messages[0].body.raw_source).to eq("Line1\r\nLine2\r\nLine3")
+    end
+  end
+
+  describe  "match on source and message (LOGSTASH-826)" do
+    it "reads messages correctly" do
+      subject = plugin.new("to" => "me@host",
+                           "subject" => "Hello World",
+                           "body" => "Mail body",
+                           "match" => [ "messageAndSourceMatch", "message,*hello,,and,type,*generator"],
+                           "options" => ["port", port, "authenticationType", "nil"])
+      subject.register
+      subject.receive(LogStash::Event.new("message" => "hello world", "type" => "generator"))
+      expect(message_observer.messages.size).to eq(1)
+      expect(message_observer.messages[0].subject).to eq("Hello World")
+      expect(message_observer.messages[0].body.raw_source).to eq("Mail body")
     end
+  end
 end
 
 

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+require "logstash/devutils/rspec/spec_helper"
+
+# use a dummy NOOP filter to test Filters::Base
+class LogStash::Filters::NOOP < LogStash::Filters::Base
+  config_name "noop"
+  milestone 2
+
+  def register; end
+
+  def filter(event)
+    return unless filter?(event)
+    filter_matched(event)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-email
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: logstash-input-generator
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
 email: info@elasticsearch.com
 executables: []
@@ -87,6 +101,7 @@ files:
 - lib/logstash/outputs/email.rb
 - logstash-output-email.gemspec
 - spec/outputs/email_spec.rb
+- spec/spec_helper.rb
 homepage: http://www.elasticsearch.org/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -115,3 +130,4 @@ specification_version: 4
 summary: Send email when an output is received.
 test_files:
 - spec/outputs/email_spec.rb
+- spec/spec_helper.rb