logstash-input-imap 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1061e859d05e791c0f30f094c6cf525a2de718a
-  data.tar.gz: 7da521531e94d56dcd148b40a4ebef1b26e265d0
+  metadata.gz: 8e44a07b4668341c7b203b9c62749c0544dc8892
+  data.tar.gz: 69834845b863c7ff2aff43743296d95f4e50b67d
 SHA512:
-  metadata.gz: 01f082faa81e940a2775294fde3f5682fb0c5361015dc36351faf22f19cf30163fa9b982f5e7412ad0e899e254f9a302628aba6dc1402a65ff1d90fa468147fd
-  data.tar.gz: 57107ddfd66c0680d32d05a79ba4a432fb1c4e1d6027fade448169b5f4b8cd7a8fe7975ce7d097b98f5dab505f3989dcbb5d249061f199db86afe51d9dc972ba
+  metadata.gz: db7e4523bc2c697778f4765c2a4d4733bf1b4bbe52707ce7a05dc781537e5edb4ac5792692577778ebd31e113370cb75b1f3c1a3454ad3259d1691bec3cefb1f
+  data.tar.gz: 8fb6a62d4b5edd78f38f88ae25bbfe102c4982db54d75d9fe77dff33e8b4dd87527dc49c4da943ee8fd8bb05ff19c726381e1134c19f56d5486d78bd7d12a08f

data/CHANGELOG.md

@@ -1,5 +1,8 @@
+## 2.0.3
+ - Fixed fields assignments
+
 ## 2.0.0
- - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully,
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
  - Dependency on logstash-core update to 2.0
 

data/README.md

@@ -1,5 +1,8 @@
 # Logstash Plugin
 
+[![Build
+Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-imap-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-imap-unit/)
+
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.

data/lib/logstash/inputs/imap.rb

@@ -32,7 +32,6 @@ class LogStash::Inputs::IMAP < LogStash::Inputs::Base
   # content-type as the event message.
   config :content_type, :validate => :string, :default => "text/plain"
 
-  public
   def register
     require "net/imap" # in stdlib
     require "mail" # gem 'mail'
@@ -89,11 +88,11 @@ class LogStash::Inputs::IMAP < LogStash::Inputs::Base
 
     imap.close
     imap.disconnect
-  end # def run
+  end
 
   def parse_mail(mail)
     # Add a debug message so we can track what message might cause an error later
-    @logger.debug("Working with message_id", :message_id => mail.message_id)
+    @logger.debug? && @logger.debug("Working with message_id", :message_id => mail.message_id)
     # TODO(sissel): What should a multipart message look like as an event?
     # For now, just take the plain-text part and set it as the message.
     if mail.parts.count == 0
@@ -106,20 +105,13 @@ class LogStash::Inputs::IMAP < LogStash::Inputs::Base
     end
 
     @codec.decode(message) do |event|
-      # event = LogStash::Event.new("message" => message)
-
       # Use the 'Date' field as the timestamp
       event.timestamp = LogStash::Timestamp.new(mail.date.to_time)
 
       # Add fields: Add message.header_fields { |h| h.name=> h.value }
       mail.header_fields.each do |header|
-        if @lowercase_headers
-          # 'header.name' can sometimes be a Mail::Multibyte::Chars, get it in
-          # String form
-          name = header.name.to_s.downcase
-        else
-          name = header.name.to_s
-        end
+        # 'header.name' can sometimes be a Mail::Multibyte::Chars, get it in String form
+        name = @lowercase_headers ? header.name.to_s.downcase : header.name.to_s
         # Call .decoded on the header in case it's in encoded-word form.
         # Details at:
         #   https://github.com/mikel/mail/blob/master/README.md#encodings
@@ -129,21 +121,24 @@ class LogStash::Inputs::IMAP < LogStash::Inputs::Base
         # Assume we already processed the 'date' above.
         next if name == "Date"
 
-        case event[name]
+        case (field = event[name])
+        when String
           # promote string to array if a header appears multiple times
           # (like 'received')
-          when String; event[name] = [event[name], value]
-          when Array; event[name] << value
-          when nil; event[name] = value
+          event[name] = [field, value]
+        when Array
+          field << value
+          event[name] = field
+        when nil
+          event[name] = value
         end
-      end # mail.header_fields.each
+      end
 
       decorate(event)
       event
     end
-  end # def handle
+  end
 
-  public
   def stop
     Stud.stop!(@run_thread)
     $stdin.close
@@ -159,4 +154,4 @@ class LogStash::Inputs::IMAP < LogStash::Inputs::Base
       s.encode(Encoding::UTF_8, :invalid => :replace, :undef => :replace)
     end
   end
-end # class LogStash::Inputs::IMAP
+end

data/logstash-input-imap.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-imap'
-  s.version         = '2.0.2'
+  s.version         = '2.0.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read mail from IMAP servers"
   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"

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-imap
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,62 +28,64 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: mail
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: mail
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: stud
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 0.0.22
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.22
-  name: stud
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.22
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   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@elastic.co
 executables: []