imap_processor 1.1.1 → 1.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 632f5afa32e055708809e6817e2532f5a5f880b48d9bb808102e63e2bad6cff7
+  data.tar.gz: 145bf8485b69a4629b32b12748edc780899db542e6a180db88a61ee6fc93ba56
+SHA512:
+  metadata.gz: e1c5b332b9d8e3dbb9f105d888cb796a1e901633f40147a241ed2ac0ec7f63664f8a9b78a0eed149d8653eace16de68190d2737462294192ecaaa0bf331d1746
+  data.tar.gz: 5561900484e14b7fe02508402af345a07a8999c56b2fdf05dd91989698b4b5a87bdd9f09acebf84232e7505b3a9ce8e57e8e9fc42041567555cf889592ec055c

data.tar.gz.sig

@@ -1,3 +1,2 @@
-AW���Bg-G��zF��H��X�d�Z�lF�:�Q?��`�C���G-��"���:���4�Ćh����/1��Ǎ
-`fx��L��>1P�=Pv��8�᧹����H���
-��в��o��G���\i�֬�)a�(�5c͌S�@"�Ŭ�=�͞nM��H��|���.�poa�et'�ruCw��8ƌ�?Zz�C(׾�iA�0�`?��"L�cp�q��ŋ��3�-�@!�YЌժU�Dr-"&
+C��>Ƙo�3����0��:��Oɩ��KiXZ��$���foL(�=��=��W-
+5m���݆+cV�1���㹶-\�GLD��W���U���
��0�&
1-�͔C���*��0��n~��C��8�;)���8���x���.ϔ1�/�e����1��AN$�F�ͭDK9�6��V5��g�

data/.autotest

@@ -2,22 +2,7 @@
 
 require 'autotest/restart'
 
-# Autotest.add_hook :initialize do |at|
-#   at.extra_files << "../some/external/dependency.rb"
-#
-#   at.libs << ":../some/external"
-#
-#   at.add_exception 'vendor'
-#
-#   at.add_mapping(/dependency.rb/) do |f, _|
-#     at.files_matching(/test_.*rb$/)
-#   end
-#
-#   %w(TestA TestB).each do |klass|
-#     at.extra_class_map[klass] = "test/test_misc.rb"
-#   end
-# end
+Autotest.add_hook :initialize do |at|
+  at.testlib = 'minitest/autorun'
+end
 
-# Autotest.add_hook :run_command do |at|
-#   system "rake build"
-# end

data/History.rdoc

@@ -0,0 +1,103 @@
+=== 1.7 / 2020-06-04
+
+* 4 minor enhancements:
+
+  * Added #noop? to improve readability.
+  * Documented how to use this with gmail.
+  * Improved imap_archive output by distinguishing hosts.
+  * Improved show_messages output to be cleaner and have better info (from/to).
+
+* 2 bug fixes:
+
+  * Fixed --noop by covering all imap calls that modify w/ checks.
+  * Fixed option processing with multiple accounts by dup'ing args to OptionParser.
+
+=== 1.6 / 2014-10-17
+
+* 1 minor enhancement:
+
+  * Add XOAUTH2 authentication type. (mattbeedle)
+
+=== 1.5 / 2014-08-06
+
+* 3 major enhancements:
+
+  * IMAPProcessor#process_args now returns an array of option hashes.
+  * IMAPProcessor.run now enumerates the array returned from process_args.
+  * You can now specify multiple host configs w/ an array of hashes in your config files.
+
+* 4 minor enhancements:
+
+  * Added --merge to imap_archive.
+  * Added --noop/-n to manually disable destructive actions. (needs to propagate down).
+  * Added imap_cleanse, imap_flag, imap_learn; migrated from IMAPCleanse.
+  * Added support for LOGIN. (bleything)
+
+* 7 bug fixes:
+
+  * Fixed initializers in flag and cleanse.
+  * Fixed odd bug w/ running on empty folders. Never saw that before. odd...
+  * Handle unparsable date entries. Stupid spammers...
+  * Now calculating latest month when not splitting directly from the date
+  * Removed 1.9/2.0 warnings.
+  * Removed dead rubyforge setting in Rakefile
+  * Split was still defaulting to true.
+
+=== 1.4 / 2011-01-10
+
+* 6 minor enhancements:
+
+  * Added explicit help option (-h didn't work)
+  * Added folder separator support (osx server uses '.' not '/')
+  * Added imap_mkdir command
+  * Added opts_file_name class var so subclass option processing can refer to file
+  * Extended imap_archive to archive multiple months per box, as necessary. Allowing easy archiving of big mailboxes
+  * Handles server-provided CAPABILITY to avoid an extra round-trip
+
+* 1 bug fix:
+
+  * Fixed doco.
+
+=== 1.3 / 2009-08-04
+
+* 1 major enhancement
+  * IMAP IDLE support now matches ruby trunk's support.  See Net::IMAP#idle
+    and Net::IMAP#idle_done
+
+=== 1.2 / 2009-06-02
+
+* 2 major enhancements
+  * imap_archive which archives old mail to dated mailboxes
+  * imap_idle which lists messages that were added or expunged from a mailbox
+
+* 4 minor enhancements
+  * Added IMAPProcessor#create_mailbox
+  * Added IMAPProcessor#delete_messages
+  * Added IMAPProcessor#move_messages
+  * Disabled verification of SSL certs for 1.9
+
+* 1 bug fix
+  * Fixed options file names, they should be Symbol keys
+
+=== 1.1.1 / 2009-05-19
+
+* 1 bug fix
+  * Got the skip test backwards
+
+=== 1.1 / 2009-05-18
+
+* 1 minor enhancement
+  * IMAPProcessor#each_message allows messages to be omitted from the returned
+    uid list (skipped)
+
+=== 1.0.1 / 2009-05-15
+
+* 2 bug fix
+  * Show correct name of options file for --password help
+  * Fix --quiet
+
+=== 1.0.0 / 2009-05-12
+
+* 1 major enhancement
+  * Birthday!
+

data/Manifest.txt

@@ -1,9 +1,25 @@
 .autotest
-History.txt
+History.rdoc
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
+bin/imap_archive
+bin/imap_cleanse
+bin/imap_flag
+bin/imap_idle
 bin/imap_keywords
+bin/imap_learn
+bin/imap_mkdir
 lib/imap_processor.rb
+lib/imap_processor/archive.rb
+lib/imap_processor/cleanse.rb
+lib/imap_processor/client.rb
+lib/imap_processor/flag.rb
+lib/imap_processor/idle.rb
 lib/imap_processor/keywords.rb
+lib/imap_processor/learn.rb
+lib/imap_processor/mkdir.rb
 lib/imap_sasl_plain.rb
+lib/net/imap/date.rb
+lib/net/imap/idle.rb
+test/test_imap_processor.rb

data/{README.txt → README.rdoc}

@@ -1,6 +1,7 @@
 = imap_processor
 
-* http://seattlerb.rubyforge.org/imap_processor
+home :: https://github.com/seattlerb/imap_processor
+rdoc :: http://docs.seattlerb.org/imap_processor
 
 == DESCRIPTION:
 
@@ -8,8 +9,16 @@ IMAPProcessor is a client for processing messages on an IMAP server.  It
 provides some basic mechanisms for connecting to an IMAP server, determining
 capabilities and handling messages.
 
-IMAPProcessor ships with the imap_keywords executable which can query an IMAP
-server for keywords set on messages in mailboxes.
+IMAPProcessor ships with several executables which can query and
+manipulate IMAP mailboxes in several different ways:
+
+imap_archive  :: Archives old messages to a new dated mailbox.
+imap_cleanse  :: Delete messages older than a certain age in specified mailboxes.
+imap_flag     :: Flag messages to/from certain people.
+imap_idle     :: Shows new messages in a mailbox.
+imap_keywords :: Queries an IMAP server for keywords set on messages
+imap_learn    :: Flags messages based on what you've flagged before.
+imap_mkdir    :: Ensures that certain mailboxes exist.
 
 == FEATURES/PROBLEMS:
 
@@ -19,7 +28,28 @@ server for keywords set on messages in mailboxes.
 
 == SYNOPSIS:
 
-See IMAPProcessor and IMAPProcessor::Keywords for details
+Run any command with --help for details.
+
+== Google Mail:
+
+This is kinda painful. You need to have Two Factor Authentication
+enabled with google, then you need to create an app specific password
+as described here: https://support.google.com/accounts/answer/185833
+
+Then, your config needs to be set up like this:
+
+    - :Host: imap.googlemail.com
+      :SSL: true
+      :Auth: PLAIN
+      :Username: your.address@gmail.com
+      :Password: app-specific-password
+
+Specifically, you need to set auth to PLAIN, and your password needs
+to your app specific password. Run with --debug to help figure
+problems out.
+
+Google is threatening to turn this off at some point and require
+oauth... at which point... I have no idea. I give up I guess.
 
 == REQUIREMENTS:
 
@@ -33,7 +63,7 @@ See IMAPProcessor and IMAPProcessor::Keywords for details
 
 (The MIT License)
 
-Copyright (c) 2009 Eric Hodel
+Copyright (c) Eric Hodel, Ryan Davis, Seattle.rb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -2,12 +2,15 @@
 
 require 'rubygems'
 require 'hoe'
-$:.unshift 'lib'
-require 'imap_processor'
 
-Hoe.new 'imap_processor', IMAPProcessor::VERSION do |ip|
-  ip.rubyforge_name = 'seattlerb'
-  ip.developer('Eric Hodel', 'drbrain@segment7.net')
+Hoe.plugin :seattlerb
+Hoe.plugin :rdoc
+
+Hoe.spec 'imap_processor' do
+  developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
+  developer 'Eric Hodel', 'drbrain@segment7.net'
+
+  license "MIT"
 end
 
 # vim: syntax=Ruby

data/bin/imap_archive

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'imap_processor/archive'
+
+IMAPProcessor::Archive.run ARGV

data/bin/imap_cleanse

@@ -0,0 +1,5 @@
+#!/usr/local/bin/ruby -w
+
+require 'imap_processor/cleanse'
+
+IMAPProcessor::Cleanse.run ARGV

data/bin/imap_flag

@@ -0,0 +1,5 @@
+#!/usr/local/bin/ruby -w
+
+require 'imap_processor/flag'
+
+IMAPProcessor::Flag.run

data/bin/imap_idle

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require 'imap_processor/idle'
+
+IMAPProcessor::IDLE.run ARGV
+

data/bin/imap_learn

@@ -0,0 +1,5 @@
+#!/usr/local/bin/ruby -w
+
+require 'imap_processor/learn'
+
+IMAPProcessor::Learn.run

data/bin/imap_mkdir

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'imap_processor/mkdir'
+
+IMAPProcessor::Mkdir.run ARGV

data/lib/imap_processor.rb

@@ -1,7 +1,9 @@
 require 'rubygems'
 require 'optparse'
 require 'net/imap'
+require 'net/imap/date'
 require 'imap_sasl_plain'
+require 'yaml'
 
 ##
 # IMAPProcessor is a client for processing messages on an IMAP server.
@@ -13,13 +15,24 @@ require 'imap_sasl_plain'
 # * An initialize method that connects to an IMAP server and sets the @imap
 #   instance variable
 # * A run method that uses the IMAP connection to process messages.
+#
+# Reference:
+#
+#     email: http://www.ietf.org/rfc/rfc0822.txt
+#      imap: http://www.ietf.org/rfc/rfc3501.txt
 
 class IMAPProcessor
 
   ##
   # The version of IMAPProcessor you are using
 
-  VERSION = '1.1.1'
+  VERSION = "1.7"
+
+  ##
+  # Base IMAPProcessor error class
+
+  class Error < RuntimeError
+  end
 
   ##
   # A Connection Struct that has +imap+ and +capability+ accessors
@@ -67,7 +80,7 @@ class IMAPProcessor
       opts.on(      "--move=MAILBOX",
               "Mailbox to move message to",
               "Default: #{options[:MoveTo].inspect}",
-              "Options file name: MoveTo") do |mailbox|
+              "Options file name: :MoveTo") do |mailbox|
         options[:MoveTo] = mailbox
       end
     end
@@ -84,24 +97,28 @@ class IMAPProcessor
   #       required_options = {
   #         :MoveTo => [nil, "MoveTo not set"],
   #       }
-  #   
-  #     super __FILE__, args, required_options do |opts, options|
-  #       opts.banner << "Explain my_processor's executable"
-  #   
-  #       opts.on(      "--move=MAILBOX",
-  #               "Mailbox to move message to",
-  #               "Default: #{options[:MoveTo].inspect}",
-  #               "Options file name: MoveTo") do |mailbox|
-  #         options[:MoveTo] = mailbox
+  #
+  #       super __FILE__, args, required_options do |opts, options|
+  #         opts.banner << "Explain my_processor's executable"
+  #
+  #         opts.on(      "--move=MAILBOX",
+  #                 "Mailbox to move message to",
+  #                 "Default: #{options[:MoveTo].inspect}",
+  #                 "Options file name: :MoveTo") do |mailbox|
+  #           options[:MoveTo] = mailbox
+  #         end
   #       end
   #     end
   #   end
+  #
+  # NOTE:  You can add a --move option using ::add_move
 
   def self.process_args(processor_file, args,
                         required_options = {}) # :yield: OptionParser
-    opts_file_name = File.basename processor_file, '.rb'
-    opts_file = File.expand_path "~/.#{opts_file_name}"
-    options = @@options.dup
+    @@opts_file_name = File.basename processor_file, '.rb'
+    @@opts_file_name = "imap_#{@@opts_file_name}" unless
+      @@opts_file_name =~ /^imap_/
+    opts_file = File.expand_path "~/.#{@@opts_file_name}"
 
     if required_options then
       required_options.each do |option, (default, message)|
@@ -111,6 +128,8 @@ class IMAPProcessor
       end
     end
 
+    defaults = [{}]
+
     if File.exist? opts_file then
       unless File.stat(opts_file).mode & 077 == 0 then
         $stderr.puts "WARNING! #{opts_file} is group/other readable or writable!"
@@ -118,165 +137,188 @@ class IMAPProcessor
         exit 1
       end
 
-      options.merge! YAML.load_file(opts_file)
+      defaults = Array(YAML.load_file(opts_file))
     end
 
-    options[:SSL]      ||= true
-    options[:Username] ||= ENV['USER']
-    options[:Root]     ||= nil
-    options[:Verbose]  ||= false
-    options[:Debug]    ||= false
+    defaults.map { |default|
+      options = default.merge @@options.dup
 
-    required_options.each do |k,(v,m)|
-      options[k]       ||= v
-    end
+      options[:SSL]        = true unless options.key? :SSL
+      options[:Username] ||= ENV['USER']
+      options[:Root]     ||= nil
+      options[:Verbose]  ||= false
+      options[:Debug]    ||= false
 
-    opts = OptionParser.new do |opts|
-      opts.program_name = File.basename $0
-      opts.banner = "Usage: #{opts.program_name} [options]\n\n"
+      required_options.each do |k,(v,_)|
+        options[k]       ||= v
+      end
 
-      opts.separator ''
-      opts.separator 'Connection options:'
+      op = OptionParser.new do |opts|
+        opts.program_name = File.basename $0
+        opts.banner = "Usage: #{opts.program_name} [options]\n\n"
 
-      opts.on("-H", "--host HOST",
-              "IMAP server host",
-              "Default: #{options[:Host].inspect}",
-              "Options file name: Host") do |host|
-        options[:Host] = host
-      end
+        opts.separator ''
+        opts.separator 'Connection options:'
 
-      opts.on("-P", "--port PORT",
-              "IMAP server port",
-              "Default: The correct port SSL/non-SSL mode",
-              "Options file name: Port") do |port|
-        options[:Port] = port
-      end
+        opts.on_tail("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
 
-      opts.on("-s", "--[no-]ssl",
-              "Use SSL for IMAP connection",
-              "Default: #{options[:SSL].inspect}",
-              "Options file name: SSL") do |ssl|
-        options[:SSL] = ssl
-      end
+        opts.on("-H", "--host HOST",
+                "IMAP server host",
+                "Default: #{options[:Host].inspect}",
+                "Options file name: :Host") do |host|
+          options[:Host] = host
+        end
 
-      opts.on(      "--[no-]debug",
-              "Display Net::IMAP debugging info",
-              "Default: #{options[:Debug].inspect}",
-              "Options file name: Debug") do |debug|
-        options[:Debug] = debug
-      end
+        opts.on("-P", "--port PORT",
+                "IMAP server port",
+                "Default: The correct port SSL/non-SSL mode",
+                "Options file name: :Port") do |port|
+          options[:Port] = port
+        end
 
-      opts.separator ''
-      opts.separator 'Login options:'
+        opts.on("-s", "--[no-]ssl",
+                "Use SSL for IMAP connection",
+                "Default: #{options[:SSL].inspect}",
+                "Options file name: :SSL") do |ssl|
+          options[:SSL] = ssl
+        end
 
-      opts.on("-u", "--username USERNAME",
-              "IMAP username",
-              "Default: #{options[:Username].inspect}",
-              "Options file name: Username") do |username|
-        options[:Username] = username
-      end
+        opts.on(      "--[no-]debug",
+                "Display Net::IMAP debugging info",
+                "Default: #{options[:Debug].inspect}",
+                "Options file name: :Debug") do |debug|
+          options[:Debug] = debug
+        end
 
-      opts.on("-p", "--password PASSWORD",
-              "IMAP password",
-              "Default: Read from ~/.#{opts_file_name}",
-              "Options file name: Password") do |password|
-        options[:Password] = password
-      end
+        opts.separator ''
+        opts.separator 'Login options:'
 
-      authenticators = Net::IMAP.send :class_variable_get, :@@authenticators
-      auth_types = authenticators.keys.sort.join ', '
-      opts.on("-a", "--auth AUTH", auth_types,
-              "IMAP authentication type override",
-              "Authentication type will be auto-",
-              "discovered",
-              "Default: #{options[:Auth].inspect}",
-              "Options file name: Auth") do |auth|
-        options[:Auth] = auth
-      end
+        opts.on("-u", "--username USERNAME",
+                "IMAP username",
+                "Default: #{options[:Username].inspect}",
+                "Options file name: :Username") do |username|
+          options[:Username] = username
+        end
 
-      opts.separator ''
-      opts.separator "IMAP options:"
+        opts.on("-p", "--password PASSWORD",
+                "IMAP password",
+                "Default: Read from ~/.#{@@opts_file_name}",
+                "Options file name: :Password") do |password|
+          options[:Password] = password
+        end
 
-      opts.on("-r", "--root ROOT",
-              "Root of mailbox hierarchy",
-              "Default: #{options[:Root].inspect}",
-              "Options file name: Root") do |root|
-        options[:Root] = root
-      end
+        authenticators = Net::IMAP.send :class_variable_get, :@@authenticators
+        auth_types = authenticators.keys.sort.join ', '
+        opts.on("-a", "--auth AUTH", auth_types,
+                "IMAP authentication type override",
+                "Authentication type will be auto-",
+                "discovered",
+                "Default: #{options[:Auth].inspect}",
+                "Options file name: :Auth") do |auth|
+          options[:Auth] = auth
+        end
 
-      opts.on("-b", "--boxes BOXES", Array,
-              "Comma-separated list of mailbox names",
-              "to search",
-              "Default: #{options[:Boxes].inspect}",
-              "Options file name: Boxes") do |boxes|
-        options[:Boxes] = boxes
-      end
+        opts.separator ''
+        opts.separator "IMAP options:"
 
-      opts.on("-v", "--[no-]verbose",
-              "Be verbose",
-              "Default: #{options[:Verbose].inspect}",
-              "Options file name: Verbose") do |verbose|
-        options[:Verbose] = verbose
-      end
+        opts.on("-r", "--root ROOT",
+                "Root of mailbox hierarchy",
+                "Default: #{options[:Root].inspect}",
+                "Options file name: :Root") do |root|
+          options[:Root] = root
+        end
 
-      opts.on("-q", "--quiet",
-              "Be quiet") do
-        options[:Verbose] = false
-      end
+        opts.on("-b", "--boxes BOXES", Array,
+                "Comma-separated list of mailbox names",
+                "to search",
+                "Default: #{options[:Boxes].inspect}",
+                "Options file name: :Boxes") do |boxes|
+          options[:Boxes] = boxes
+        end
 
-      if block_given? then
-        opts.separator ''
-        opts.separator "#{self} options:"
+        opts.on("-v", "--[no-]verbose",
+                "Be verbose",
+                "Default: #{options[:Verbose].inspect}",
+                "Options file name: :Verbose") do |verbose|
+          options[:Verbose] = verbose
+        end
 
-        yield opts, options if block_given?
-      end
+        opts.on("-n", "--noop",
+                "Perform no destructive operations",
+                "Best used with the verbose option",
+                "Default: #{options[:Noop].inspect}",
+                "Options file name: Noop") do |noop|
+          options[:Noop] = noop
+        end
 
-      @@extra_options.each do |block|
-        block.call opts, options
-      end
+        opts.on("-q", "--quiet",
+                "Be quiet") do
+          options[:Verbose] = false
+        end
 
-      opts.separator ''
+        if block_given? then
+          opts.separator ''
+          opts.separator "#{self} options:"
+
+          yield opts, options if block_given?
+        end
+
+        @@extra_options.each do |block|
+          block.call opts, options
+        end
+
+        opts.separator ''
 
-      opts.banner << <<-EOF
+        opts.banner << <<-EOF
 
-Options may also be set in the options file ~/.#{opts_file_name}
+Options may also be set in the options file ~/.#{@@opts_file_name}
 
-Example ~/.#{opts_file_name}:
+Example ~/.#{@@opts_file_name}:
 \tHost=mail.example.com
 \tPassword=my password
 
-      EOF
-    end
+        EOF
+
+      end # OptionParser.new do
+
+      op.parse! args.dup
 
-    opts.parse! args
-
-    options[:Port] ||= options[:SSL] ? 993 : 143
-
-    if options[:Host].nil? or
-       options[:Password].nil? or
-       options[:Boxes].nil? or
-       required_options.any? { |k,(v,m)| options[k].nil? } then
-      $stderr.puts opts
-      $stderr.puts
-      $stderr.puts "Host name not set" if options[:Host].nil?
-      $stderr.puts "Password not set"  if options[:Password].nil?
-      $stderr.puts "Boxes not set"     if options[:Boxes].nil?
-      required_options.each do |option_name, (option_value, missing_message)|
-        $stderr.puts missing_message if options[option_name].nil?
+      options[:Port] ||= options[:SSL] ? 993 : 143
+
+      # HACK: removed :Boxes -- push down
+      required_keys = [:Host, :Password] + required_options.keys
+      if required_keys.any? { |k| options[k].nil? } then
+        $stderr.puts op
+        $stderr.puts
+        $stderr.puts "Host name not set" if options[:Host].nil?
+        $stderr.puts "Password not set"  if options[:Password].nil?
+        $stderr.puts "Boxes not set"     if options[:Boxes].nil?
+        required_options.each do |option_name, (_, missing_message)|
+          $stderr.puts missing_message if options[option_name].nil?
+        end
+        exit 1
       end
-      exit 1
-    end
 
-    return options
+      options
+    } # defaults.map
   end
 
   ##
   # Sets up an IMAP processor's options then calls its \#run method.
 
   def self.run(args = ARGV, &block)
-    options = process_args args
-    client = new(options, &block)
-    client.run
+    client = nil
+    multi_options = process_args args
+
+    multi_options.each do |options|
+      client = new(options, &block)
+      client.run
+    end
+  rescue Interrupt
+    exit
   rescue SystemExit
     raise
   rescue Exception => e
@@ -285,7 +327,7 @@ Example ~/.#{opts_file_name}:
 
     exit 1
   ensure
-    client.imap.logout if client
+    client.imap.logout if client and client.imap
   end
 
   ##
@@ -299,34 +341,102 @@ Example ~/.#{opts_file_name}:
     Net::IMAP.debug = options[:Debug]
   end
 
+  ##
+  # Extracts capability information for +imap+ from +res+ or by contacting the
+  # server.
+
+  def capability imap, res = nil
+    return imap.capability unless res
+
+    data = res.data
+
+    if data.code and data.code.name == 'CAPABILITY' then
+      data.code.data.split ' '
+    else
+      imap.capability
+    end
+  end
+
   ##
   # Connects to IMAP server +host+ at +port+ using ssl if +ssl+ is true then
-  # logs in as +username+ with +password+.  IMAPProcessor is only known to
-  # work with PLAIN auth on SSL sockets.
+  # authenticates with +username+ and +password+.  IMAPProcessor is only known
+  # to work with PLAIN auth on SSL sockets.  IMAPProcessor does not support
+  # LOGIN.
   #
   # Returns a Connection object.
 
-  def connect(host, port, ssl, username, password, auth = nil)
-    imap = Net::IMAP.new host, port, ssl
+  def connect(host = @options[:Host],
+              port = @options[:Port],
+              ssl = @options[:SSL],
+              username = @options[:Username],
+              password = @options[:Password],
+              auth = @options[:Auth]) # :yields: Connection
+    imap = Net::IMAP.new host, port, ssl, nil, false
     log "Connected to imap://#{host}:#{port}/"
 
-    capability = imap.capability
+    capabilities = capability imap, imap.greeting
 
-    log "Capabilities: #{capability.join ', '}"
+    log "Capabilities: #{capabilities.join ', '}"
 
-    auth_caps = capability.select { |c| c =~ /^AUTH/ }
+    auth_caps = capabilities.select { |c| c =~ /^AUTH/ }
 
     if auth.nil? then
       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}"
+    # Net::IMAP supports using AUTHENTICATE with LOGIN, PLAIN, and
+    # CRAM-MD5... if the server reports a different AUTH method, then we
+    # should fall back to using LOGIN
+    if %w( LOGIN PLAIN CRAM-MD5 XOAUTH2 ).include?( auth.upcase )
+      auth = auth.upcase
+      log "Trying #{auth} authentication"
+      res = imap.authenticate auth, username, password
+      log "Logged in as #{username} using AUTHENTICATE"
+    else
+      log "Trying to authenticate via LOGIN"
+      res = imap.login username, password
+      log "Logged in as #{username} using LOGIN"
+    end
+
+    # CAPABILITY may have changed
+    capabilities = capability imap, res
+
+    connection = Connection.new imap, capabilities
+
+    if block_given? then
+      begin
+        yield connection
+      ensure
+        connection.imap.logout
+      end
+    else
+      return connection
+    end
+  end
+
+  ##
+  # Create the mailbox +name+ if it doesn't exist.  Note that this will SELECT
+  # the mailbox if it exists.
+
+  def create_mailbox name
+    log "LIST #{name}"
+    list = imap.list '', name
+    return if list
+    log "CREATE #{name}"
+    imap.create name unless noop?
+  end
 
-    Connection.new imap, capability
+  ##
+  # Delete and +expunge+ the specified +uids+.
+
+  def delete_messages uids, expunge = true
+    log "DELETING [...#{uids.size} uids]"
+    imap.store uids, '+FLAGS.SILENT', [:Deleted] unless noop?
+    if expunge then
+      log "EXPUNGE"
+      imap.expunge unless noop?
+    end
   end
 
   ##
@@ -347,8 +457,6 @@ Example ~/.#{opts_file_name}:
     uids = []
 
     each_part parts, true do |uid, message|
-      skip = false
-
       mail = TMail::Mail.parse message
 
       begin
@@ -379,7 +487,7 @@ Example ~/.#{opts_file_name}:
       sequence.unshift "BODY[#{section}.MIME]" unless section == 'TEXT'
       sequence.unshift 'BODY[HEADER]' if header
 
-      body = @imap.fetch(uid, sequence).first
+      body = imap.fetch(uid, sequence).first
 
       sequence = sequence.map { |item| body.attr[item] }
 
@@ -411,7 +519,7 @@ Example ~/.#{opts_file_name}:
   def mime_parts(uids, mime_type)
     media_type, subtype = mime_type.upcase.split('/', 2)
 
-    structures = @imap.fetch uids, 'BODYSTRUCTURE'
+    structures = imap.fetch uids, 'BODYSTRUCTURE'
 
     structures.zip(uids).map do |body, uid|
       section = nil
@@ -436,6 +544,43 @@ Example ~/.#{opts_file_name}:
     end.compact
   end
 
+  ##
+  # Move the specified +uids+ to a new +destination+ then delete and +expunge+
+  # them.  Creates the destination mailbox if it doesn't exist.
+
+  def move_messages uids, destination, expunge = true
+    return if uids.empty?
+    log "COPY [...#{uids.size} uids]"
+
+    begin
+      imap.copy uids, destination unless noop?
+    rescue Net::IMAP::NoResponseError
+      unless noop? then
+        create_mailbox destination
+        imap.copy uids, destination
+      end
+    end
+
+    delete_messages uids, expunge
+  end
+
+  ##
+  # Displays Date, Subject and Message-Id from messages in +uids+
+
+  def show_messages(uids)
+    return if uids.nil? or (Array === uids and uids.empty?)
+
+    fetch_data = 'BODY.PEEK[HEADER.FIELDS (DATE FROM TO SUBJECT)]'
+    messages = imap.fetch uids, fetch_data
+    fetch_data.sub! '.PEEK', '' # stripped by server
+
+    messages ||= []
+
+    messages.each do |res|
+      puts res.attr[fetch_data].delete("\r").gsub(/^/, "  ")
+    end
+  end
+
   ##
   # Did the user set --verbose?
 
@@ -443,5 +588,10 @@ Example ~/.#{opts_file_name}:
     @verbose
   end
 
-end
+  ##
+  # Did the user set --noop?
 
+  def noop?
+    options[:Noop]
+  end
+end