logstash-input-imap 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b3d7a3e57749470d8a0d28b7965e9045ecabdbf
-  data.tar.gz: 7c920ed0e1af522c35993c19cc882d2918a06583
+  metadata.gz: c7cdeac8548919f13cef32541a78c915d3a2503a
+  data.tar.gz: 152ce1be4ed5101ba7af55ee6f2e90f9eec0af6f
 SHA512:
-  metadata.gz: 639012e79e3438d35f1371482d02bc3bdefddaef872f2e2d81c82cdbec84c45debdf722c76116399c68d69df1e9dcd169d7b017c2d990971ef1e25d845d9f7c7
-  data.tar.gz: 231a8f549646f6ffea5425fe21d947a443a71383ed1463c58c0cf0a41ec6f4c3ce8fb27de97fc6f756201e1e08acde62d2a7b8bac1d149f473b55bee2e28f46e
+  metadata.gz: 9184c73a1f142010ea1d93121eb672aa04ab4f73fc2fc067d25d00d31d958e9866ef414620f9f69696f3e0d57926ea385d6427e399b313eda171de0bd35c5501
+  data.tar.gz: bf8e8486ea3fa2f25ac2df727313589dec14bb38ac671da359210ad7d674917773a9767160442ee766d6d9ee60df88156dd1ff042595ba8aad2ea0ee83ee7dca

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.0.2
+  - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
+
 ## 3.0.1
   - Republish all the gems under jruby.
 ## 3.0.0

data/lib/logstash/inputs/imap.rb

@@ -27,7 +27,9 @@ class LogStash::Inputs::IMAP < LogStash::Inputs::Base
   config :lowercase_headers, :validate => :boolean, :default => true
   config :check_interval, :validate => :number, :default => 300
   config :delete, :validate => :boolean, :default => false
-
+  config :expunge, :validate => :boolean, :default => false
+  config :strip_attachments, :validate => :boolean, :default => false
+  
   # For multipart messages, use the first part that has this
   # content-type as the event message.
   config :content_type, :validate => :string, :default => "text/plain"
@@ -80,10 +82,23 @@ class LogStash::Inputs::IMAP < LogStash::Inputs::Base
       items.each do |item|
         next unless item.attr.has_key?("RFC822")
         mail = Mail.read_from_string(item.attr["RFC822"])
-        queue << parse_mail(mail)
+        if @strip_attachments
+          queue << parse_mail(mail.without_attachments!)
+        else
+          queue << parse_mail(mail)
+        end
       end
 
       imap.store(id_set, '+FLAGS', @delete ? :Deleted : :Seen)
+  
+    end
+
+  # Enable an 'expunge' IMAP command after the items.each loop
+    if @expunge 
+    # Force messages to be marked as "Deleted", the above may or may not be working as expected. "Seen" means nothing if you are going to
+    # delete a message after processing.
+      imap.store(id_set, '+FLAGS', [:Deleted])
+      imap.expunge()
     end
 
     imap.close

data/logstash-input-imap.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-imap'
-  s.version         = '3.0.1'
+  s.version         = '3.0.2'
   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/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'mail', '~> 2.6.3'
   s.add_runtime_dependency 'mime-types', '2.6.2'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-imap
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.99'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -131,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.3
 signing_key:
 specification_version: 4
 summary: Read mail from IMAP servers