clacks 1.0.5 → 1.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWM1MmUwNDEzYTU0NmY0M2FlZWVkODUxN2U1MGUyYWEwZTI0NWQ2Zg==
+    ODk1Y2ZlZDEzYTUwMTUwNTUyODEwM2ZmM2JiMDY2MmRiOTRiZjQ5OA==
   data.tar.gz: !binary |-
-    ZjI2OTQ4ZTBkYjNhMjU5MjExMDFjMzk5OWQyMzk2NDFjNzA1N2E4OA==
+    NjhlNDZlMjA1YjIxOGYzMjVlYzBmNjcyYzU1NGE1MmFhOGJmMjk5ZA==
 SHA512:
   metadata.gz: !binary |-
-    ZDZiZjU5MGViYTY1MzUzZjNiZTEzOTk0MmE4NDljNWZjMjVjNDc4ZTVmMGI4
-    ZjNlMDE1OTBiZmRiMDE5MzAxNTMwNjRkM2FkZTVlYjQzMjZjMmYzODU3Y2Ix
-    ZGFhMDAyYjZmZmQ5YmJiMDE3YmM0YzAxMTk5MDI4ZDYxNjViMDE=
+    MTgzZTU3MTgzMjUyMWM4NzVhMGE4ZTNhYjA3YTVkYTg0YTg0NjQzOWFkMGM3
+    ZDAwOTA4YjJhNTEzNjlkMWVhMjUxZDE3ZTIyNTQzOTg5ODY1ZTc2NjE1Y2Iy
+    MDZlNjVhMjUzODM4YTQ2N2QwNTc5ZDhmZTk2NmZiNjk4ZjA4NDc=
   data.tar.gz: !binary |-
-    ZWZlMDZmYTM3MTZjMGFmNjQ2YmRlNWNiYzQ1YzkwNDhjZjM1NGJhYTk4MjZk
-    NzVhMzdiNzE2YmQ5MjY1N2E3MzQ3MzMyYmYxYjNhZDYzNDg0N2ZlYTk3MWY3
-    MjhlYTUxMjcyYzZlYmMzNWQxM2JkMTZjZjM0ZTE2OGFkZDJkMmM=
+    ZDBjZjQ2ZTM1MGU1MzgzZTZmNGVkN2IyNTJmYzViZTIzZThiOTMzYjc1ZGU4
+    NGZhNzBlMWIxYzcwNzQyZTJhZWU0OGI3MzlkMDRiOWJkNTA1Y2I1NDM1MDky
+    NzVlMjhhZmZjODA0MDUxNzJlYmU3MTEyNmQ4MTVlYWEwN2YwMTE=

data/lib/clacks/service.rb

@@ -127,6 +127,7 @@ module Clacks
     # or until a QUIT signal is received to stop the process.
     def imap_find(imap)
       options = Clacks.config[:find_options]
+      delete_after_find = options[:delete_after_find]
       begin
         break if stopping?
         uids = imap.uid_search(options[:keys] || 'ALL')
@@ -135,14 +136,14 @@ module Clacks
         uids.reverse! if (options[:what].to_sym == :last && options[:order].to_sym == :asc) ||
                          (options[:what].to_sym != :last && options[:order].to_sym == :desc)
         processed = 0
+        expunge = false
         uids.each do |uid|
           break if stopping?
           source = imap.uid_fetch(uid, ['RFC822']).first.attr['RFC822']
-          break if stopping?
           mail = nil
           begin
             mail = Mail.new(source)
-            mail.mark_for_delete = true if options[:delete_after_find]
+            mail.mark_for_delete = true if delete_after_find
             Clacks.config[:on_mail].call(mail)
           rescue Exception => e
             Clacks.logger.debug(e.message)
@@ -150,7 +151,8 @@ module Clacks
           end
           begin
             imap.uid_copy(uid, options[:archivebox]) if options[:archivebox]
-            if options[:delete_after_find] && (mail.nil? || mail.is_marked_for_delete?)
+            if delete_after_find && (mail.nil? || mail.is_marked_for_delete?)
+              expunge = true
               imap.uid_store(uid, "+FLAGS", [Net::IMAP::DELETED])
             end
           rescue Exception => e
@@ -158,7 +160,7 @@ module Clacks
           end
           processed += 1
         end
-        imap.expunge if options[:delete_after_find]
+        imap.expunge if expunge
       end while uids.any? && processed == uids.length
     end
 

data/lib/clacks/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding: binary -*-
 module Clacks
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

metadata

@@ -2,14 +2,14 @@
 name: clacks
 version: !ruby/object:Gem::Version
   version: !binary |-
-    MS4wLjU=
+    MS4wLjY=
 platform: ruby
 authors:
 - ITRP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail