IMAPCleanse 1.1.1 → 1.2.0

data/Rakefile

@@ -9,7 +9,7 @@ $VERBOSE = nil
 
 spec = Gem::Specification.new do |s|
   s.name = 'IMAPCleanse'
-  s.version = '1.1.1'
+  s.version = '1.2.0'
   s.summary = 'Removes mailbox oldness, finds mailbox interestingness!'
   s.description = 'IMAPCleanse removes old, read, unflagged messages from your IMAP mailboxes so you don\'t have to!
   

data/lib/imap_client.rb

@@ -1,3 +1,4 @@
+$TESTING = false unless defined? $TESTING
 require 'net/imap'
 require 'imap_sasl_plain'
 require 'optparse'
@@ -91,8 +92,20 @@ class IMAPClient
         options[:Password] = password
       end
 
+      authenticators = Net::IMAP.send :class_variable_get, :@@authenticators
+      auth_types = authenticators.keys.sort.join ', '
+      opts.on("-a", "--auth AUTH",
+              "IMAP authentication type override",
+              "Authentication type will be auto-",
+              "discovered",
+              "Default: #{options[:Auth].inspect}",
+              "Valid values: #{auth_types}",
+              "Options file name: Auth") do |auth|
+        options[:Auth] = auth
+      end
+
       opts.separator ''
-      opts.separator "#{self.class} options:"
+      opts.separator "#{self} options:"
 
       opts.on("-r", "--root ROOT",
               "Root of mailbox hierarchy",
@@ -166,6 +179,10 @@ class IMAPClient
     options = process_args args
     client = new options
     client.run
+  rescue => e
+    $stderr.puts "Failed to finish with exception: #{e.class}:#{e.message}"
+    $stderr.puts "\t#{e.backtrace.join "\n\t"}"
+    exit 1
   end
 
   ##
@@ -181,22 +198,26 @@ class IMAPClient
   #   +:SSL+:: SSL flag
   #   +:Username+:: IMAP username
   #   +:Password+:: IMAP password
+  #   +:Auth+:: IMAP authentication type
 
   def initialize(options)
     @verbose = options[:Verbose]
     @noop    = options[:Noop]
     @root    = options[:Root]
 
-    boxes = options[:Boxes].split(',').map { |b| Regexp.escape b }
-    @box_re = /^#{Regexp.escape @root}\/#{Regexp.union(*boxes)}/
+    root = @root
+    root += "/" unless root.empty?
+
+    boxes = options[:Boxes].split(/,\s*/)
+    @box_re = /^#{Regexp.escape root}#{Regexp.union(*boxes)}/
 
     connect options[:Host], options[:Port], options[:SSL],
-            options[:Username], options[:Password]
+            options[:Username], options[:Password], options[:Auth]
   end
 
   ##
-  # Runs the main selecting messages from mailboxes then marking them
-  # with +flags+.  If a block is given it is run after message marking.
+  # Selects messages from mailboxes then marking them with +flags+.  If a
+  # block is given it is run after message marking.
   # 
   # Unless :Noop was set, then it just prints out what it would do.
   #
@@ -231,17 +252,26 @@ class IMAPClient
     log "Done. Found #{message_count} messages in #{mailboxes.length} mailboxes"
   end
 
-  private
+  private unless $TESTING
 
   ##
   # Connects to IMAP server +host+ at +port+ using ssl if +ssl+ is true then
   # logs in as +username+ with +password+.  IMAPClient will really only work
   # with PLAIN auth on SSL sockets, sorry.
 
-  def connect(host, port, ssl, username, password)
+  def connect(host, port, ssl, username, password, auth = nil)
     @imap = Net::IMAP.new host, port, ssl
     log "Connected to #{host}:#{port}"
-    @imap.authenticate 'PLAIN', username, password
+
+    if auth.nil? then
+      auth_caps = @imap.capability.select { |c| c =~ /^AUTH/ }
+      raise "Couldn't find a supported auth type" if auth_caps.empty?
+      auth = auth_caps.first.sub(/AUTH=/, '')
+    end
+
+    auth = auth.upcase
+    log "Trying #{auth} authentication"
+    @imap.authenticate auth, username, password
     log "Logged in as #{username}"
   end
 
@@ -250,6 +280,12 @@ class IMAPClient
 
   def find_mailboxes
     mailboxes = @imap.list(@root, "*")
+
+    if mailboxes.nil? then
+      log "Found no mailboxes, you may have an incorrect root"
+      return []
+    end
+
     mailboxes.reject! { |mailbox| mailbox.attr.include? :Noselect }
     mailboxes.map! { |mailbox| mailbox.name }
     mailboxes.reject! { |mailbox| mailbox !~ @box_re }

data/lib/imap_flag.rb

@@ -51,7 +51,7 @@ class IMAPFlag < IMAPClient
   # and all options from IMAPClient
 
   def initialize(options)
-    @email = options[:Email]
+    @email = options[:Email].split(/,\s*/)
     super
   end
 
@@ -86,11 +86,13 @@ class IMAPFlag < IMAPClient
   # Messages I wrote in the selected mailbox.
 
   def wrote_in_curr
-    search [
-      'FROM', @email,
-      'NOT', 'FLAGGED',
-      'NOT', 'KEYWORD', AUTO_FLAG_KEYWORD
-    ], 'messages I wrote'
+    @email.map { |email|
+      search [
+              'FROM', email,
+              'NOT', 'FLAGGED',
+              'NOT', 'KEYWORD', AUTO_FLAG_KEYWORD
+             ], "messages by #{email}"
+    }
   end
 
   ##
@@ -98,7 +100,7 @@ class IMAPFlag < IMAPClient
 
   def responses_in_curr
     log "Scanning for responses to messages I wrote"
-    my_mail = @imap.search [ 'FROM', @email ]
+    my_mail = @email.map { |email| @imap.search [ 'FROM', email ] }.flatten
 
     return [] if my_mail.empty?
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11.15
 specification_version: 1
 name: IMAPCleanse
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2006-05-08 00:00:00 -07:00
+  version: 1.2.0
+date: 2006-05-23 00:00:00 -07:00
 summary: Removes mailbox oldness, finds mailbox interestingness!
 require_paths: 
 - lib