imap_archiver 0.0.4 → 0.0.5

data/Gemfile

@@ -5,7 +5,7 @@ gem 'i18n'
 group :development do
   gem 'rake', '~> 0.8.7'
   gem 'jeweler', '~> 1.5.1'
-  gem 'rspec', '~> 2.0.0'
+  gem 'rspec', '~> 2.3.0'
   gem 'cucumber', :git => 'http://github.com/aslakhellesoy/cucumber.git'
   gem 'aruba'
   gem 'mocha'

data/Gemfile.lock

@@ -30,16 +30,14 @@ GEM
     mocha (0.9.8)
       rake
     rake (0.8.7)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
     term-ansicolor (1.0.5)
     trollop (1.16.2)
 
@@ -56,4 +54,4 @@ DEPENDENCIES
   jeweler (~> 1.5.1)
   mocha
   rake (~> 0.8.7)
-  rspec (~> 2.0.0)
+  rspec (~> 2.3.0)

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.5

data/lib/imap_archiver/archiver.rb

@@ -1,11 +1,21 @@
+require "logger"
 require "config"
 module ImapArchiver
   class Archiver
     include ::ImapArchiver::Config
     attr_accessor :connection
-    def initialize(config_file)
+    def initialize(config_file,debug=false)
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::WARN
+      if debug
+        @logger.level = Logger::DEBUG
+        @Logger.debug "Debugging enabled."
+      end
+      @logger.debug "Loading config"
       self.load_config(config_file)
+      @logger.debug "config loaded"
       config_valid?
+      @logger.debug "config valid"
     end
     
     def connect
@@ -14,18 +24,22 @@ module ImapArchiver
     end
     
     def reconnect
+      @logger.debug "reconnect"
       self.connection = Net::IMAP.new(imap_server) rescue nil
+      @logger.debug "connected"
       capability = self.connection.capability rescue nil
+      @logger.debug "capability: #{capability.inspect}"
       if capability.detect {|c| c =~ /AUTH=(CRAM|DIGEST)-MD5/}
-        # puts "loging in with #{auth_mech}"
+        @logger.debug "loging in with #{auth_mech}"
         self.connection.authenticate(auth_mech,username,password)
       else
-        # puts "plain login"
+        @logger.debug "plain login"
         self.connection.login(username,password) rescue nil
       end
     end
     
     def folder_list
+      @logger.debug "folder_list"
       connect if connection.nil?
       if folders_to_archive.is_a? Array
         folders = folders_to_archive.map {|f| connection.list('',f)}
@@ -39,25 +53,29 @@ module ImapArchiver
     end
     
     def start 
+      @logger.debug "start"
       folder_list.each do |folder|        
+        @logger.debug "starting folder #{folder}"
         since_date = Date.today.months_ago(3).beginning_of_month 
-        before_date= Date.today.months_ago(3).end_of_month 
+        before_date= Date.today.months_ago(2).beginning_of_month 
         archive_folder_between_dates(folder.name,since_date,before_date) #if folder.name =~ /^Public Folders\/Team\//
       end
     end
     
     def archive_folder_between_dates(folder, since_date, before_date)
+      @logger.debug "archive_folder_between_dates #{folder}, #{since_date}, #{before_date}"
       tmp_folder = Pathname.new(folder).relative_path_from(Pathname.new(base_folder)).to_s
       current_archive_folder = "#{archive_folder}/#{tmp_folder}/#{since_date.strftime("%b %Y")}"
-      # puts archive_folder
+      @logger.debug "archiving to #{archive_folder}"
       conditions = ["SINCE", since_date.strftime("%d-%b-%Y"), "BEFORE", before_date.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]
+      @logger.debug conditions.join(" ")
       retry_count = 0
       begin
         connection.select(folder)
         # puts "will search 1"
         msgs_to_archive = connection.search(conditions)
         if msgs_to_archive.size > 0
-          # puts "will archive #{msgs_to_archive.size} messages"
+          @logger.debug "will archive #{msgs_to_archive.size} messages"
           if connection.list("",current_archive_folder).nil?
             connection.create(current_archive_folder)
             if connection.capability.include?("ACL")
@@ -72,11 +90,12 @@ module ImapArchiver
           connection.expunge
         end
         if connection.search(["BEFORE", since_date.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).size > 0
-          archive_folder_between_dates(folder,since_date.months_ago(1), since_date-1)
+          archive_folder_between_dates(folder,since_date.prev_month, since_date)
         end
       rescue IOError => e
         retry_count += 1
-        # puts "retrying"
+        @logger.debug e.backtrace
+        @logger.debug "retrying"
         if retry_count < 3
           reconnect
           retry
@@ -98,8 +117,8 @@ module ImapArchiver
       end
     end
     
-    def self.run(config_file)
+    def self.run(config_file,debug=false)
       self.new(config_file).start
     end    
   end
-end
+end

data/lib/imap_archiver/cli.rb

@@ -6,7 +6,8 @@ module ImapArchiver
 
       # NOTE: the option -p/--path= is given as an example, and should be replaced in your application.
       options = {
-        :config_file => "~/.imap_archiver.rb"
+        :config_file => "~/.imap_archiver.rb",
+        :debug => false
       }
       mandatory_options = %w(  )
 
@@ -19,6 +20,7 @@ module ImapArchiver
         opts.separator ""
         opts.on("-h", "--help",
                 "Show this help message.") { stdout.puts opts; exit }
+        opts.on("-d", "--debug", "Enable debugging.") { options[:debug] = true}
         opts.on("-F PATH", "", String, "Configuration file", "Default: ~/.imap_archiver.yml"){|arg| options[:config_file] = arg}
         opts.parse!(arguments)
 
@@ -28,9 +30,9 @@ module ImapArchiver
       end
       
       # Config.load_config(options[:config_file])
-      Archiver.run(options[:config_file])
+      Archiver.run(options[:config_file],options[:debug])
       
       return 0
     end
   end
-end
+end

data/spec/cli_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe ImapArchiver::CLI do
   it "should start the archiver with the default config file if no options are given" do
-    ImapArchiver::Archiver.expects(:run).with('~/.imap_archiver.rb')
+    ImapArchiver::Archiver.expects(:run).with('~/.imap_archiver.rb',false)
     ImapArchiver::CLI.execute(STDOUT,STDIN,[])
   end
   
@@ -11,6 +11,7 @@ describe ImapArchiver::CLI do
 Options are:
 
     -h, --help                       Show this help message.
+    -d, --debug                      Enable debugging.
     -F PATH
                                      Configuration file
                                      Default: ~/.imap_archiver.yml
@@ -23,7 +24,7 @@ Options are:
   end
   
   it "should load the given config file" do
-    ImapArchiver::Archiver.expects(:run).with('/tmp/imap_archiver.rb')
+    ImapArchiver::Archiver.expects(:run).with('/tmp/imap_archiver.rb',false)
     ImapArchiver::CLI.execute(STDOUT,STDIN,%w(-F /tmp/imap_archiver.rb))
   end
-end
+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.3"
+    ImapArchiver::Version.should == "0.0.5"
   end
 end

data/spec/integration_spec.rb

@@ -65,7 +65,7 @@ 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.end_of_month.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).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(: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")}")
@@ -87,10 +87,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.end_of_month.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).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(: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.end_of_month.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).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(:search).with(["BEFORE", @archive_date.strftime("%d-%b-%Y"), "SEEN", "NOT", "FLAGGED"]).returns([])
 
       ImapArchiver::CLI.execute(STDOUT,STDIN,["-F",@config_file.path])
@@ -137,4 +137,4 @@ describe "imap_archiver" do
       ImapArchiver::CLI.execute(STDOUT,STDIN,["-F",@config_file.path])
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: imap_archiver
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jelle Helsen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 +01:00
+date: 2011-02-05 00:00:00 +01:00
 default_executable: imap_archiver
 dependencies: 
 - !ruby/object:Gem::Dependency