imap_archiver 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/imap_archiver/archiver.rb

@@ -73,7 +73,7 @@ module ImapArchiver
       begin
         connection.select(folder)
         # puts "will search 1"
-        msgs_to_archive = connection.search(conditions)
+        msgs_to_archive = connection.uid_search(conditions)
         @logger.debug "#{msgs_to_archive.size} msgs to archive"
         if msgs_to_archive.size > 0
           @logger.debug "will archive #{msgs_to_archive.size} messages"
@@ -87,9 +87,10 @@ module ImapArchiver
             end
           end
           while !msgs_to_archive.empty? && (msgs = msgs_to_archive.slice!(0,100))
-            connection.copy(msgs, current_archive_folder)
-            connection.store(msgs, "+FLAGS",[:Deleted])
+            connection.uid_copy(msgs, current_archive_folder)
+            connection.uid_store(msgs, "+FLAGS",[:Deleted])
             @msg_count += msgs.size
+            @logger.info "archived #{msg_count} messages"
           end
           connection.expunge
         end

data/spec/archiver_spec.rb

@@ -41,11 +41,12 @@ describe ImapArchiver::Archiver do
     it "should reconnect when an IOError is raised during archiving" do
       @archiver.instance_variable_set(:@msg_count, 0)
       @archiver.connection.expects(:select).times(2)
-      @archiver.connection.expects(:search).times(3).returns([1],[1],[])
+      @archiver.connection.expects(:uid_search).times(2).returns([1],[1])
+      @archiver.connection.expects(:search).returns([])
       @archiver.connection.expects(:list).times(2).returns(true)
-      @archiver.connection.stubs(:copy).raises(IOError).then.returns(nil)
+      @archiver.connection.stubs(:uid_copy).raises(IOError).then.returns(nil)
       @archiver.expects(:reconnect).times(1)
-      @archiver.connection.expects(:store)
+      @archiver.connection.expects(:uid_store)
       @archiver.connection.expects(:expunge)
       @archiver.archive_folder_between_dates('Public Folders/test',Date.today,Date.today)
     end
@@ -78,7 +79,8 @@ describe ImapArchiver::Archiver do
       @archiver.folders_to_archive = ["Public Folders/test1", "test2"]
       @archiver.connection.expects(:list).with('',"Public Folders/test1").returns([stub(:name => 'Public Folders/test1')])
       @archiver.connection.expects(:list).with('',"test2").returns([stub(:name => 'test2')])
-      @archiver.connection.expects(:search).times(4).returns([])
+      @archiver.connection.expects(:search).times(2).returns([])
+      @archiver.connection.expects(:uid_search).times(2).returns([])
       @archiver.start
     end
     
@@ -125,7 +127,7 @@ describe ImapArchiver::Archiver do
       @archiver.connection.stubs(:capability).returns([])
       @archiver.connection.stubs(:list).returns(mock)
       @archiver.connection.stubs(:select)
-      @archiver.connection.stubs(:store)
+      #@archiver.connection.stubs(:store)
       @archiver.connection.stubs(:expunge)
       @archiver.instance_variable_set("@msg_count",0)
     end
@@ -136,18 +138,30 @@ describe ImapArchiver::Archiver do
       since_date = Date.today.months_ago(3).beginning_of_month 
       before_date= Date.today.months_ago(2).beginning_of_month 
       conditions = ["SINCE", since_date.strftime("%d-%b-%Y"), "BEFORE", before_date.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]
-      @archiver.connection.expects(:search).with(conditions).returns((1..996).to_a)
+      @archiver.connection.expects(:uid_search).with(conditions).returns((1..996).to_a)
       @archiver.connection.expects(:search).with(["BEFORE", since_date.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).returns([])
-      @archiver.connection.expects(:copy).with((1..100).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
-      @archiver.connection.expects(:copy).with((101..200).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
-      @archiver.connection.expects(:copy).with((201..300).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
-      @archiver.connection.expects(:copy).with((301..400).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
-      @archiver.connection.expects(:copy).with((401..500).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
-      @archiver.connection.expects(:copy).with((501..600).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
-      @archiver.connection.expects(:copy).with((601..700).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
-      @archiver.connection.expects(:copy).with((701..800).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
-      @archiver.connection.expects(:copy).with((801..900).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
-      @archiver.connection.expects(:copy).with((901..996).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:uid_copy).with((1..100).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:uid_copy).with((101..200).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:uid_copy).with((201..300).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:uid_copy).with((301..400).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:uid_copy).with((401..500).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:uid_copy).with((501..600).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:uid_copy).with((601..700).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:uid_copy).with((701..800).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:uid_copy).with((801..900).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      @archiver.connection.expects(:uid_copy).with((901..996).to_a, "archive/test1/#{since_date.strftime("%b %Y")}")
+      
+      @archiver.connection.expects(:uid_store).with((1..100).to_a,   "+FLAGS",[:Deleted])
+      @archiver.connection.expects(:uid_store).with((101..200).to_a, "+FLAGS",[:Deleted])
+      @archiver.connection.expects(:uid_store).with((201..300).to_a, "+FLAGS",[:Deleted])
+      @archiver.connection.expects(:uid_store).with((301..400).to_a, "+FLAGS",[:Deleted])
+      @archiver.connection.expects(:uid_store).with((401..500).to_a, "+FLAGS",[:Deleted])
+      @archiver.connection.expects(:uid_store).with((501..600).to_a, "+FLAGS",[:Deleted])
+      @archiver.connection.expects(:uid_store).with((601..700).to_a, "+FLAGS",[:Deleted])
+      @archiver.connection.expects(:uid_store).with((701..800).to_a, "+FLAGS",[:Deleted])
+      @archiver.connection.expects(:uid_store).with((801..900).to_a, "+FLAGS",[:Deleted])
+      @archiver.connection.expects(:uid_store).with((901..996).to_a, "+FLAGS",[:Deleted])
+    
       @archiver.archive_folder_between_dates("Public Folders/test1",since_date,before_date) #if folder.name =~ /^Public Folders\/Team\//
       @archiver.instance_variable_get("@msg_count").should == 996
     end

data/spec/imap_archiver_spec.rb

@@ -2,6 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "ImapArchiver" do
   it "should read the correct version" do
-    ImapArchiver::Version.should == "0.0.6"
+    ImapArchiver::Version.should == "0.0.7"
   end
 end

data/spec/integration_spec.rb

@@ -37,14 +37,16 @@ describe "imap_archiver" do
     it "should select and search the matching mailboxes" do
       @connection.expects(:list).with("","*").returns([mock1=stub(:name=>'testfolder'),mock2=stub(:name=>'foldertest')])
       @connection.expects(:select).with('testfolder')
-      @connection.expects(:search).twice.returns([]) #search current range and before
+      @connection.expects(:search).returns([])
+      @connection.expects(:uid_search).returns([])
       ImapArchiver::CLI.execute(STDOUT,STDIN,["-F",@config_file.path])
     end
 
     it "should create a mailbox for archiving if it does not exist" do
       @connection.expects(:list).with("","*").returns([mock1=stub(:name=>'testfolder'),mock2=stub(:name=>'foldertest')])
       @connection.expects(:select).with('testfolder')
-      @connection.expects(:search).twice.returns([1,2],[])
+      @connection.expects(:search).returns([])
+      @connection.expects(:uid_search).returns([1,2])
       @connection.expects(:list).with('',"/Archive/test/testfolder/#{@archive_date.strftime("%b %Y")}")
       @connection.expects(:create).with("/Archive/test/testfolder/#{@archive_date.strftime("%b %Y")}")
 
@@ -54,7 +56,8 @@ describe "imap_archiver" do
     it "should not create a mailbox for archiving if it does  exist" do
       @connection.expects(:list).with("","*").returns([mock1=stub(:name=>'testfolder'),mock2=stub(:name=>'foldertest')])
       @connection.expects(:select).with('testfolder')
-      @connection.expects(:search).twice.returns([1,2],[])
+      @connection.expects(:search).returns([])
+      @connection.expects(:uid_search).returns([1,2])
       @connection.expects(:list).with('',"/Archive/test/testfolder/#{@archive_date.strftime("%b %Y")}").returns(stub_everything('archive folder'))
       @connection.expects(:create).never
 
@@ -65,10 +68,10 @@ describe "imap_archiver" do
       @connection.expects(:list).with("","*").returns([mock1=stub(:name=>'testfolder'),mock2=stub(:name=>'foldertest')])
       @connection.expects(:select).with('testfolder')
       # @connection.expects(:search).twice.returns([1,2],[])
-      @connection.expects(:search).with(["SINCE", @archive_date.strftime("%d-%b-%Y"), "BEFORE", @archive_date.next_month.beginning_of_month.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).returns([1,2])
+      @connection.expects(:uid_search).with(["SINCE", @archive_date.strftime("%d-%b-%Y"), "BEFORE", @archive_date.next_month.beginning_of_month.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).returns([1,2])
       @connection.expects(:search).with(["BEFORE", @archive_date.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).returns([])
 
-      @connection.expects(:copy).with([1,2],"/Archive/test/testfolder/#{@archive_date.strftime("%b %Y")}")
+      @connection.expects(:uid_copy).with([1,2],"/Archive/test/testfolder/#{@archive_date.strftime("%b %Y")}")
 
       ImapArchiver::CLI.execute(STDOUT,STDIN,["-F",@config_file.path])
 
@@ -77,8 +80,9 @@ describe "imap_archiver" do
     it "should delete the copied messages" do
       @connection.expects(:list).with("","*").returns([mock1=stub(:name=>'testfolder'),mock2=stub(:name=>'foldertest')])
       @connection.expects(:select).with('testfolder')
-      @connection.expects(:search).twice.returns([1,2],[])
-      @connection.expects(:store).with([1,2],"+FLAGS",[:Deleted])
+      @connection.expects(:search).returns([])
+      @connection.expects(:uid_search).returns([1,2])
+      @connection.expects(:uid_store).with([1,2],"+FLAGS",[:Deleted])
       @connection.expects(:expunge)
       ImapArchiver::CLI.execute(STDOUT,STDIN,["-F",@config_file.path])
 
@@ -87,10 +91,10 @@ describe "imap_archiver" do
     it "should search for messages older then the archiving period" do
       @connection.expects(:list).with("","*").returns([mock1=stub(:name=>'testfolder'),mock2=stub(:name=>'foldertest')])
       @connection.expects(:select).with('testfolder').twice
-      @connection.expects(:search).with(["SINCE", @archive_date.strftime("%d-%b-%Y"), "BEFORE", @archive_date.next_month.beginning_of_month.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).returns([1,2])
+      @connection.expects(:uid_search).with(["SINCE", @archive_date.strftime("%d-%b-%Y"), "BEFORE", @archive_date.next_month.beginning_of_month.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).returns([1,2])
       @connection.expects(:search).with(["BEFORE", @archive_date.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).returns([3,4])
       @archive_date = @archive_date.prev_month
-      @connection.expects(:search).with(["SINCE", @archive_date.strftime("%d-%b-%Y"), "BEFORE", @archive_date.next_month.beginning_of_month.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).returns([1,2])
+      @connection.expects(:uid_search).with(["SINCE", @archive_date.strftime("%d-%b-%Y"), "BEFORE", @archive_date.next_month.beginning_of_month.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).returns([1,2])
       @connection.expects(:search).with(["BEFORE", @archive_date.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).returns([])
 
       ImapArchiver::CLI.execute(STDOUT,STDIN,["-F",@config_file.path])
@@ -99,7 +103,8 @@ describe "imap_archiver" do
     it "should set the correct acl on newly created archive folders" do
       @connection.expects(:list).with("","*").returns([mock1=stub(:name=>'testfolder'),mock2=stub(:name=>'foldertest')])
       @connection.expects(:select).with('testfolder')
-      @connection.expects(:search).twice.returns([1,2],[])
+      @connection.expects(:search).returns([])
+      @connection.expects(:uid_search).returns([1,2])
       @connection.expects(:list).with('',"/Archive/test/testfolder/#{@archive_date.strftime("%b %Y")}")
       @connection.expects(:create).with("/Archive/test/testfolder/#{@archive_date.strftime("%b %Y")}")
       @connection.expects(:setacl).with("/Archive/test/testfolder/#{@archive_date.strftime("%b %Y")}",'jhelsen','lrswpcda')
@@ -133,7 +138,8 @@ describe "imap_archiver" do
     it "should select and search the matching mailboxes" do
       @connection.expects(:list).with("","test1").returns([mock1=stub(:name=>'test1')])
       @connection.expects(:select).with('test1')
-      @connection.expects(:search).twice.returns([]) #search current range and before
+      @connection.expects(:uid_search).returns([]) #search current range 
+      @connection.expects(:search).returns([]) #and before
       ImapArchiver::CLI.execute(STDOUT,STDIN,["-F",@config_file.path])
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: imap_archiver
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jelle Helsen