vmail 2.8.9 → 2.9.0

data/lib/vmail/contacts_extractor.rb

@@ -1,10 +1,14 @@
 require 'net/imap'
+require 'vmail/defaults'
 
 module Vmail
 class ContactsExtractor
-  def initialize(username, password)
+  def initialize(username, password, mailbox_config)
     puts "Logging as #{username}"
     @username, @password = username, password
+
+    @sent_mailbox = mailbox_config && mailbox_config['sent']
+    @sent_mailbox ||= Vmail::Defaults::MAILBOX_ALIASES['sent']
   end
 
   def open
@@ -18,7 +22,7 @@ class ContactsExtractor
   def extract(limit = 500)
     open do |imap|
       set_mailbox_prefix
-      mailbox = "[#@prefix]/Sent Mail"
+      mailbox = "[#@prefix]/#@sent_mailbox"
       STDERR.puts "Selecting #{mailbox}"
       imap.select(mailbox)
       STDERR.puts "Fetching last #{limit} sent messages"

data/lib/vmail/defaults.rb

@@ -0,0 +1,13 @@
+module Vmail
+  module Defaults
+    MAILBOX_ALIASES = {
+      'sent' => 'Sent Mail',
+      'all' => 'All Mail',
+      'starred' => 'Starred',
+      'important' => 'Important',
+      'drafts' => 'Drafts',
+      'spam' => 'Spam',
+      'trash' => 'Trash'
+    }
+  end
+end

data/lib/vmail/imap_client.rb

@@ -7,6 +7,7 @@ require 'net/imap'
 require 'time'
 require 'logger'
 require 'tempfile'
+require 'vmail/defaults'
 require 'vmail/helpers'
 require 'vmail/address_quoter'
 require 'vmail/database'
@@ -53,6 +54,11 @@ module Vmail
       @date_formatter_this_year = config['date_format'] || '%b %d %I:%M%P'
       @date_formatter_prev_years = config['date_format_previous_years'] || '%b %d %Y'
       @date_width = DateTime.parse("12/12/2012 12:12:12").strftime(@date_formatter_this_year).length
+
+      mailbox_aliases_config = config['mailbox_aliases'] || {}
+      @default_mailbox_aliases = Vmail::Defaults::MAILBOX_ALIASES.merge(
+        mailbox_aliases_config)
+
       current_message = nil
     end
 
@@ -172,15 +178,8 @@ module Vmail
     # do this just once
     def mailbox_aliases
       return @mailbox_aliases if @mailbox_aliases
-      aliases = {"sent" => "Sent Mail",
-                 "all" => "All Mail",
-                 "starred" => "Starred",
-                 "important" => "Important",
-                 "drafts" => "Drafts",
-                 "spam" => "Spam",
-                 "trash" => "Trash"}
       @mailbox_aliases = {}
-      aliases.each do |shortname, fullname|
+      @default_mailbox_aliases.each do |shortname, fullname|
         [ "[Gmail]", "[Google Mail]" ].each do |prefix|
           if self.mailboxes.include?( "#{prefix}/#{fullname}" )
             @mailbox_aliases[shortname] =  "#{prefix}/#{fullname}"

data/lib/vmail/options.rb

@@ -73,7 +73,8 @@ EOF
 
           if @get_contacts
             require 'vmail/contacts_extractor'
-            extractor = ContactsExtractor.new(@config['username'], @config['password'])
+            extractor = ContactsExtractor.new(@config['username'],
+              @config['password'], @config['mailbox_aliases'])
             File.open(DEFAULT_CONTACTS_FILENAME, 'w') do |file|
               extractor.extract(@max_messages_to_scan) do |address|
                 STDERR.print '.'

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = '2.8.9'
+  VERSION = '2.9.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmail
 version: !ruby/object:Gem::Version
-  version: 2.8.9
+  version: 2.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -117,6 +117,7 @@ files:
 - lib/vmail/address_quoter.rb
 - lib/vmail/contacts_extractor.rb
 - lib/vmail/database.rb
+- lib/vmail/defaults.rb
 - lib/vmail/flagging_and_moving.rb
 - lib/vmail/helpers.rb
 - lib/vmail/imap_client.rb
@@ -175,4 +176,3 @@ signing_key:
 specification_version: 3
 summary: A Vim interface to Gmail
 test_files: []
-has_rdoc: