vmail 0.0.6 → 0.0.7

data/NOTES

@@ -481,13 +481,20 @@ DONE
   - can specify a directory, then all the items in the directory get
     attached and sent
 - extract and append text of all selected messages into file (append)
-
-next:
+- ,s s confusion? Star vs search
+  - ,* is star now
+- archive function (shortcut for move to all mail)
+- remember searches?
+- perma-delete from Trash
+- put move to> and copy to> prompts
+- create mailboxes if they don't exist on move or copy
 - tweak contacts list script (plus instruction for how to use)
+- .vmailrc is a yaml file, first in current dir, then check home, can
+  also use command line opts
+- fix tests
+
+NEXT:
 - help doc: just return readme file, or a vim version of it (vim filetype later)
-- follow mysql and use -u and -p flags on startup of server?
-  - omitting -p flag forces prompt
-- ,s s confusion? Star vs search
 - note dependence on lynx in README
 
 later:
@@ -495,8 +502,6 @@ later:
 - mvim redrawstatus line bug
   http://vim.1045645.n5.nabble.com/Redrawing-bug-in-MacVim-Command-T-since-commit-ba44868-td3248742.html
 - allow one daemon, multiple clients (select mailbox?)
-- remember searches?
-- archive function (shortcut for move to all mail)
 - crate to package app as a OS X app?
   http://rubyconf2008.confreaks.com/crate-packaging-your-ruby-application.html
   - need to bundle macvim
@@ -523,7 +528,9 @@ later:
 - enhance contacts auto fix with more advanced vim script
 - create contacts database on first startup
 
-
+won't do
+- follow mysql and use -u and -p flags on startup of server?
+  - omitting -p flag forces prompt
 
 ------------------------------------------------------------------------
 
@@ -536,4 +543,8 @@ imap.search ["HEADER", "MESSAGE-ID", "<757FC46C-9394-494E-91B4-B051F48419DA@prx.
 
   % is filename
 
+  " TODO the range doesn't quite work as expect, need <line1> <line2>
+  " trying to make user defined commands that work from : prompt
+  " command -buffer -range VmailDelete call s:toggle_star("Deleted")
+  " command -buffer -range VmailStar call s:toggle_star("Flagged")
 

data/bin/vmail

@@ -4,7 +4,7 @@ begin
   require 'vmail'
 rescue LoadError
   require 'rubygems'
-  require 'gmail'
+  require 'vmail'
 end
 
 Vmail.start

data/lib/vmail.rb

@@ -1,3 +1,4 @@
+require 'vmail/options'
 require 'vmail/imap_client'
 
 module Vmail
@@ -6,13 +7,23 @@ module Vmail
   def start
     vim = ENV['VMAIL_VIM'] || 'vim'
 
-    config = YAML::load(File.read(File.expand_path("~/gmail.yml")))
+    opts = Vmail::Options.new(ARGV)
+    opts.config
+
+    config = opts.config
+    contacts_file = opts.contacts_file
+
     logfile = (vim == 'mvim') ? STDERR : 'vmail.log'
     config.merge! 'logfile' => logfile
 
-    puts "starting vmail imap client with config #{config}"
+    puts "starting vmail imap client for #{config['username']}"
 
-    drb_uri = Vmail::ImapClient.daemon config
+    drb_uri = begin 
+                Vmail::ImapClient.daemon config
+              rescue 
+                puts "Failure:", $!
+                exit(1)
+              end
 
     server = DRbObject.new_with_uri drb_uri
 
@@ -34,7 +45,7 @@ module Vmail
 
     # invoke vim
     vimscript = File.expand_path("../vmail.vim", __FILE__)
-    vim_command = "DRB_URI='#{drb_uri}' VMAIL_MAILBOX=#{String.shellescape(mailbox)} VMAIL_QUERY=#{String.shellescape(query.join(' '))} #{vim} -S #{vimscript} #{buffer_file}"
+    vim_command = "DRB_URI='#{drb_uri}' VMAIL_CONTACTS_FILE=#{contacts_file} VMAIL_MAILBOX=#{String.shellescape(mailbox)} VMAIL_QUERY=#{String.shellescape(query.join(' '))} #{vim} -S #{vimscript} #{buffer_file}"
     puts vim_command
     system(vim_command)
 

data/lib/vmail.vim

@@ -16,6 +16,7 @@ let s:more_messages_command = s:client_script . "more_messages "
 let s:flag_command = s:client_script . "flag "
 let s:append_to_file_command = s:client_script . "append_to_file "
 let s:move_to_command = s:client_script . "move_to "
+let s:copy_to_command = s:client_script . "copy_to "
 let s:new_message_template_command = s:client_script . "new_message_template "
 let s:reply_template_command = s:client_script . "reply_template "
 let s:forward_template_command = s:client_script . "forward_template "
@@ -24,7 +25,6 @@ let s:save_draft_command = s:client_script . "save_draft "
 let s:save_attachments_command = s:client_script . "save_attachments "
 let s:open_html_command = s:client_script . "open_html_part "
 let s:message_bufname = "MessageWindow"
-let s:list_bufname = "MessageListWindow"
 
 function! VmailStatusLine()
   return "%<%f\ " . s:mailbox . " " . s:query . "%r%=%-14.(%l,%c%V%)\ %P"
@@ -256,8 +256,33 @@ func! s:delete_messages(flag) range
   if len(uids) > 2
     call feedkeys("\<cr>")
   endif
+  redraw
+  echo len(uids) . " message" . (len(uids) == 1 ? '' : 's') . " marked " . a:flag
+endfunc
+
+func! s:archive_messages() range
+  let lnum = a:firstline
+  let n = 0
+  let uids = []
+  while lnum <= a:lastline
+    let line =  getline(lnum)
+    let message_uid = matchstr(line, '^\d\+')
+    call add(uids, message_uid)
+    let lnum = lnum + 1
+  endwhile
+  let uid_set = join(uids, ",")
+  let command = s:move_to_command . uid_set . ' ' . shellescape("[Gmail]/All Mail")
+  echo "archiving message" . (len(uids) == 1 ? '' : 's')
+  let res = system(command)
+  setlocal modifiable
+  exec a:firstline . "," . a:lastline . "delete"
+  setlocal nomodifiable
+  write
+  redraw
+  echo len(uids) . " message" . (len(uids) == 1 ? '' : 's') . " archived"
 endfunc
 
+
 " --------------------------------------------------------------------------------
 " append text bodies of a set of messages to a file
 func! s:append_messages_to_file() range
@@ -281,7 +306,8 @@ endfunc
 
 " --------------------------------------------------------------------------------
 " move to another mailbox
-function! s:move_to_mailbox() range
+function! s:move_to_mailbox(copy) range
+  let s:copy_to_mailbox = a:copy
   let lnum = a:firstline
   let n = 0
   let uids = []
@@ -301,31 +327,38 @@ function! s:move_to_mailbox() range
   setlocal noswapfile
   setlocal modifiable
   resize 1
+  let prompt = "select mailbox to " . (a:copy ? 'copy' : 'move') . " to: "
+  call setline(1, prompt)
+  normal $
   inoremap <silent> <buffer> <cr> <Esc>:call <SID>complete_move_to_mailbox()<CR> 
   inoremap <silent> <buffer> <esc> <Esc>:q<cr>
   set completefunc=CompleteMoveMailbox
   " c-p clears the line
   let s:firstline = a:firstline 
   let s:lastline = a:lastline
-  call feedkeys("i\<c-x>\<c-u>\<c-p>", 't')
+  call feedkeys("a\<c-x>\<c-u>\<c-p>", 't')
   " save these in script scope to delete the lines when move completes
 endfunction
 
-" Open command window to choose a mailbox to move a message to.
-" Very similar to mailbox_window() function
 function! s:complete_move_to_mailbox()
-  let mailbox = getline(line('.'))
+  let mailbox = get(split(getline(line('.')), ": "), 1)
   close
-  " check if mailbox is a real mailbox
-  if (index(s:mailboxes, mailbox) == -1) 
-    return
+  if s:copy_to_mailbox 
+    let command = s:copy_to_command . s:uid_set . ' ' . shellescape(mailbox)
+  else
+    let command = s:move_to_command . s:uid_set . ' ' . shellescape(mailbox)
   endif
-  let command = s:move_to_command . s:uid_set . ' ' . shellescape(mailbox)
-  echo command
+  redraw
+  echo "moving uids ". s:uid_set . " to mailbox " . mailbox 
   let res = system(command)
   setlocal modifiable
-  exec s:firstline . "," . s:lastline . "delete"
+  if !s:copy_to_mailbox
+    exec s:firstline . "," . s:lastline . "delete"
+  end
   setlocal nomodifiable
+  write
+  redraw
+  echo "done"
 endfunction
 
 function! CompleteMoveMailbox(findstart, base)
@@ -334,7 +367,12 @@ function! CompleteMoveMailbox(findstart, base)
   endif
   if a:findstart
     " locate the start of the word
-    return 0
+    let line = getline('.')
+    let start = col('.') - 1
+    while start > 0 && line[start - 1] =~ '\a'
+      let start -= 1
+    endwhile
+    return start
   else
     " find months matching with "a:base"
     let res = []
@@ -359,13 +397,37 @@ function! s:get_mailbox_list()
   let s:mailboxes = split(res, "\n", '')
 endfunction
 
+" -------------------------------------------------------------------------------
+" select mailbox
+
+function! s:mailbox_window()
+  call s:get_mailbox_list()
+  topleft split MailboxSelect
+  setlocal buftype=nofile
+  setlocal noswapfile
+  setlocal modifiable
+  resize 1
+  inoremap <silent> <buffer> <cr> <Esc>:call <SID>select_mailbox()<CR> 
+  inoremap <silent> <buffer> <esc> <Esc>:q<cr>
+  set completefunc=CompleteMailbox
+  " c-p clears the line
+  call setline(1, "select mailbox to switch to: ")
+  normal $
+  call feedkeys("a\<c-x>\<c-u>\<c-p>", 't')
+endfunction
+
 function! CompleteMailbox(findstart, base)
   if !exists("s:mailboxes")
     call s:get_mailbox_list()
   endif
   if a:findstart
     " locate the start of the word
-    return 0
+    let line = getline('.')
+    let start = col('.') - 1
+    while start > 0 && line[start - 1] =~ '\a'
+      let start -= 1
+    endwhile
+    return start
   else
     " find mailboxes matching with "a:base"
     let res = []
@@ -378,34 +440,11 @@ function! CompleteMailbox(findstart, base)
   endif
 endfun
 
-" -------------------------------------------------------------------------------
-" select mailbox
-
-function! s:mailbox_window()
-  if !exists("s:mailboxes")
-    call s:get_mailbox_list()
-  endif
-  topleft split MailboxSelect
-  setlocal buftype=nofile
-  setlocal noswapfile
-  setlocal modifiable
-  resize 1
-  inoremap <silent> <buffer> <cr> <Esc>:call <SID>select_mailbox()<CR> 
-  inoremap <silent> <buffer> <esc> <Esc>:q<cr>
-  set completefunc=CompleteMailbox
-  " c-p clears the line
-  call feedkeys("i\<c-x>\<c-u>\<c-p>", 't')
-endfunction
-
 function! s:select_mailbox()
-  let mailbox = getline(line('.'))
+  let mailbox = get(split(getline(line('.')), ": "), 1)
   close
   call s:focus_message_window()
   close
-  " check if mailbox is a real mailbox
-  if (index(s:mailboxes, mailbox) == -1) 
-    return
-  endif
   let s:mailbox = mailbox
   let command = s:select_mailbox_command . shellescape(s:mailbox)
   call system(command)
@@ -421,6 +460,7 @@ function! s:select_mailbox()
   execute "normal Gdd\<c-y>" 
   normal G
   setlocal nomodifiable
+  write
   normal z.
 endfunction
 
@@ -460,6 +500,7 @@ function! s:do_search()
   execute "normal Gdd\<c-y>" 
   normal z.
   setlocal nomodifiable
+  write
 endfunction
 
 function! s:more_messages()
@@ -519,6 +560,7 @@ func! s:open_compose_window(command)
   close!
   1,$delete
   put! =res
+  call feedkeys("\<cr>")
   normal 1G
   call s:compose_window_mappings()
   set completefunc=CompleteContact
@@ -540,7 +582,7 @@ function! CompleteContact(findstart, base)
     return start
   else
     " find contacts matching with "a:base"
-    let matches = system("grep -i " . shellescape(a:base) . " contacts.txt")
+    let matches = system("grep -i " . shellescape(a:base) . " " . $VMAIL_CONTACTS_FILE)
     return split(matches, "\n")
   endif
 endfun
@@ -620,8 +662,11 @@ func! s:message_window_mappings()
   noremap <silent> <buffer> <Leader>c :call <SID>compose_message()<CR>
   noremap <silent> <buffer> <Leader>h :call <SID>open_html_part()<CR><cr>
   nnoremap <silent> <buffer> q :close<cr>
-  nnoremap <silent> <buffer> <leader>d  :call <SID>focus_list_window()<cr>:call <SID>delete_messages("Deleted")<cr>
-  nnoremap <silent> <buffer> s  :call <SID>focus_list_window()<cr>:call <SID>toggle_star()<cr>
+  nnoremap <silent> <buffer> <leader>#  :call <SID>focus_list_window()<cr>:call <SID>delete_messages("Deleted")<cr>
+  nnoremap <silent> <buffer> <leader>*  :call <SID>focus_list_window()<cr>:call <SID>toggle_star()<cr>
+  nnoremap <silent> <buffer> <Leader>b :call <SID>focus_list_window()<cr>call <SID>move_to_mailbox(0)<CR>
+  nnoremap <silent> <buffer> <Leader>B :call <SID>focus_list_window()<cr>call <SID>move_to_mailbox(1)<CR>
+  nnoremap <silent> <buffer> <leader>e  :call <SID>focus_list_window()<cr>:call <SID>archive_messages()<cr>
   nnoremap <silent> <buffer> u :call <SID>focus_list_window()<cr>:call <SID>update()<CR>
   nnoremap <silent> <buffer> <Leader>m :call <SID>focus_list_window()<cr>:call <SID>mailbox_window()<CR>
   nnoremap <silent> <buffer> <Leader>A :call <SID>save_attachments()<cr>
@@ -632,20 +677,18 @@ endfunc
 func! s:message_list_window_mappings()
   noremap <silent> <buffer> <cr> :call <SID>show_message()<CR>
   noremap <silent> <buffer> q :qal!<cr>
-  noremap <silent> <buffer> s :call <SID>toggle_star()<CR>
-  noremap <silent> <buffer> <leader>d :call <SID>delete_messages("Deleted")<CR>
-  " TODO the range doesn't quite work as expect, need <line1> <line2>
-  " trying to make user defined commands that work from : prompt
-  " command -buffer -range VmailDelete call s:toggle_star("Deleted")
-  " command -buffer -range VmailStar call s:toggle_star("Flagged")
+  noremap <silent> <buffer> <leader>* :call <SID>toggle_star()<CR>
+  noremap <silent> <buffer> <leader># :call <SID>delete_messages("Deleted")<CR>
   noremap <silent> <buffer> <leader>! :call <SID>delete_messages("[Gmail]/Spam")<CR>
+  noremap <silent> <buffer> <leader>e :call <SID>archive_messages()<CR>
   "open a link browser (os x)
   "autocmd CursorMoved <buffer> call <SID>show_message()
   noremap <silent> <buffer> <leader>vp :call <SID>append_messages_to_file()<CR>
   noremap <silent> <buffer> u :call <SID>update()<CR>
   noremap <silent> <buffer> <Leader>s :call <SID>search_query()<CR>
   noremap <silent> <buffer> <Leader>m :call <SID>mailbox_window()<CR>
-  noremap <silent> <buffer> <Leader>v :call <SID>move_to_mailbox()<CR>
+  noremap <silent> <buffer> <Leader>b :call <SID>move_to_mailbox(0)<CR>
+  noremap <silent> <buffer> <Leader>B :call <SID>move_to_mailbox(1)<CR>
   noremap <silent> <buffer> <Leader>c :call <SID>compose_message()<CR>
   noremap <silent> <buffer> <Leader>r :call <SID>show_message()<cr>:call <SID>compose_reply(0)<CR>
   noremap <silent> <buffer> <Leader>a :call <SID>show_message()<cr>:call <SID>compose_reply(1)<CR>

data/lib/{contacts_extractor.rb → vmail/contacts_extractor.rb}

@@ -1,27 +1,30 @@
 require 'net/imap'
 
+module Vmail
 class ContactsExtractor
-  def initialize(config)
-    @username, @password = config['login'], config['password']
+  def initialize(username, password)
+    puts "logging as #{username}"
+    @username, @password = username, password
   end
 
   def open
     @imap = Net::IMAP.new('imap.gmail.com', 993, true, nil, false)
-    @imap.login(@username, @password)
+    puts @imap.login(@username, @password)
     yield @imap
     @imap.close 
     @imap.disconnect
   end
 
-  def extract!
-    @contacts = []
+  def extract(limit = 500)
     open do |imap|
       mailbox = '[Gmail]/Sent Mail'
       STDERR.puts "selecting #{mailbox}"
       imap.select(mailbox)
-      STDERR.puts "fetching last 500 sent messages"
+      STDERR.puts "fetching last #{limit} sent messages"
       all_uids = imap.uid_search('ALL')
-      limit = [500, all_uids.size].max
+      STDERR.puts "total messages: #{all_uids.size}"
+      limit = [limit, all_uids.size].min
+      STDERR.puts "extracting addresses from #{limit} of them"
       uids = all_uids[-limit ,limit]
       imap.uid_fetch(uids, ["FLAGS", "ENVELOPE"]).each do |fetch_data|
         recipients = fetch_data.attr["ENVELOPE"].to
@@ -30,21 +33,15 @@ class ContactsExtractor
           email = [address_struct.mailbox, address_struct.host].join('@') 
           name = address_struct.name
           if name 
-            puts "#{name} <#{email}>"
+            name = Mail::Encodings.unquote_and_convert_to(name, 'utf-8') 
+            yield "#{name} <#{email}>"
           else
-            puts email
+            yield email
           end
         end
       end
     end
-    @contacts
   end
 end
-
-if __FILE__ == $0
-  require 'yaml'
-  config = YAML::load(File.read(File.expand_path("../../config/gmail.yml", __FILE__)))
-  extractor = ContactsExtractor.new(config)
-  # pipe through uniq | sort 
-  extractor.extract!
 end
+

data/lib/vmail/imap_client.rb

@@ -269,7 +269,9 @@ EOF
       if flg == 'Deleted'
         # for delete, do in a separate thread because deletions are slow
         Thread.new do 
-          @imap.uid_copy(uid_set, "[Gmail]/Trash")
+          unless @mailbox == '[Gmail]/Trash'
+            @imap.uid_copy(uid_set, "[Gmail]/Trash")
+          end
           res = @imap.uid_store(uid_set, action, [flg.to_sym])
         end
         uid_set.each { |uid| @all_uids.delete(uid) }
@@ -285,11 +287,11 @@ EOF
       end
     end
 
-    # uid_set is a string comming from the vim client
     def move_to(uid_set, mailbox)
       if MailboxAliases[mailbox]
         mailbox = MailboxAliases[mailbox]
       end
+      create_if_necessary mailbox
       log "move_to #{uid_set.inspect} #{mailbox}"
       if uid_set.is_a?(String)
         uid_set = uid_set.split(",").map(&:to_i)
@@ -298,6 +300,26 @@ EOF
       log @imap.uid_store(uid_set, '+FLAGS', [:Deleted])
     end
 
+    def copy_to(uid_set, mailbox)
+      if MailboxAliases[mailbox]
+        mailbox = MailboxAliases[mailbox]
+      end
+      create_if_necessary mailbox
+      log "copy #{uid_set.inspect} #{mailbox}"
+      if uid_set.is_a?(String)
+        uid_set = uid_set.split(",").map(&:to_i)
+      end
+      log @imap.uid_copy(uid_set, mailbox)
+    end
+
+    def create_if_necessary(mailbox)
+      if !@mailboxes.include?(mailbox) 
+        log "creating mailbox #{mailbox}"
+        log @imap.create(mailbox) 
+        @mailboxes = nil # force reload next fime list_mailboxes() called
+      end
+    end
+
     def append_to_file(file, uid_set)
       if uid_set.is_a?(String)
         uid_set = uid_set.split(",").map(&:to_i)
@@ -512,7 +534,7 @@ EOF
 
     def self.daemon(config)
       $gmail = self.start(config)
-      puts DRb.start_service(nil, $gmail)
+      DRb.start_service(nil, $gmail)
       uri = DRb.uri
       puts "starting gmail service at #{uri}"
       uri

data/lib/vmail/options.rb

@@ -0,0 +1,129 @@
+require 'optparse'
+require 'highline/import'
+
+module Vmail
+  class Options
+    DEFAULT_CONTACTS_FILENAME = "vmail-contacts.txt"
+    attr_accessor :config
+    attr_accessor :contacts_file
+    def initialize(argv)
+      config_file_locations = ['.vmailrc', "#{ENV['HOME']}/.vmailrc"]
+      @config_file = config_file_locations.detect do |path|
+        File.exists?(File.expand_path(path))
+      end
+      @contacts_file = [DEFAULT_CONTACTS_FILENAME, "#{ENV['HOME']}/#{DEFAULT_CONTACTS_FILENAME}"].detect  do |path|
+        File.exists?(File.expand_path(path))
+      end
+      @config = {}
+      parse argv
+    end
+
+    def parse(argv)
+      OptionParser.new do |opts|
+        opts.banner = "Usage:  vmail [ options ] [ limit ] [ imap search query ]" 
+        opts.separator ""
+        opts.separator "Specific options:"
+        opts.on("-c", "--config path", String, "Path to config file") do |config_file|
+          @config_file = config_file
+        end
+        opts.on("-t", "--contacts path", String, "Path to contacts file") do |file|
+          @contacts_file = file
+        end
+        opts.on("-g[n]", "--getcontacts[n]", Integer, "Generate contacts file. n is number of emails to scan (default 500).") do |n| 
+          @get_contacts = true
+          @max_messages_to_scan = n || 500
+        end
+        opts.on("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
+        opts.separator ""
+        opts.separator INSTRUCTIONS
+
+        begin
+          opts.parse!(argv)
+          if @config_file && File.exists?(@config_file)
+            puts "Using config file #{@config_file}"
+          else
+            puts <<EOF
+
+Missing config file! 
+
+#{INSTRUCTIONS}
+EOF
+            exit(1)
+          end
+
+          if @contacts_file.nil?
+            puts "No contacts file found for auto-completion. See help for how to generate it."
+            sleep 0.5
+          end
+
+          @config = YAML::load(File.read(@config_file))
+          if @config['password'].nil?
+            @config['password'] = ask("Enter gmail password (won't be visible & won't be persisted):") {|q| q.echo = false}
+          end
+
+          if @get_contacts
+            require 'vmail/contacts_extractor'
+            extractor = ContactsExtractor.new(@config['username'], @config['password'])
+            File.open(DEFAULT_CONTACTS_FILENAME, 'w') do |file|
+              extractor.extract(@max_messages_to_scan) do |address| 
+                STDERR.print '.'
+                file.puts(address.strip)
+                STDERR.flush 
+              end
+            end
+            STDERR.print "\n"
+            puts "saved file to #{DEFAULT_CONTACTS_FILENAME}"
+            puts "sorting address..."
+            cmd = "sort #{DEFAULT_CONTACTS_FILENAME} | uniq > vmail-tmp.txt" 
+            cmd2 = "mv vmail-tmp.txt #{DEFAULT_CONTACTS_FILENAME}"
+            `#{cmd}`
+            `#{cmd2}`
+            puts "done"
+            exit
+          end
+
+        rescue OptionParser::ParseError => e
+          STDERR.puts e.message, "\n", opts
+        end
+
+      end
+    end
+  end
+
+  INSTRUCTIONS = <<-EOF
+CONFIGURATION FILE
+
+To run vmail, you need to create a yaml file called .vmailrc and save it
+either in the current directory (the directory from which you launch
+vmail) or in your home directory. 
+
+This file should look like this, except using your settings:
+
+username: dhchoi@gmail.com
+password: password
+name: Daniel Choi
+signature: |
+  --
+  Sent via vmail. https://github.com/danchoi/vmail
+
+This file should be formatted according to the rules of YAML.
+http://www.yaml.org/spec/1.2/spec.html
+
+You can omit the password key-value pair if you'd rather not have the password
+on disk. In that case, you'll prompted for the password each time you
+start vmail.
+
+CONTACTS AUTOCOMPLETION
+
+Vmail uses vim autocompletion to help you auto-complete email addresses.
+To use this feature, generate a vim-contacts.txt file in the current or
+home directory. This is a simple list of all the email addresses.
+Invoking vmail with the -g option generates this file for you by
+collecting all the recipients and cc's from your last 500 or so sent
+emails. 
+
+  EOF
+end

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/message_formatter_test.rb

@@ -7,7 +7,7 @@ describe Vmail::MessageFormatter do
     before do
       @raw = File.read(File.expand_path('../fixtures/google-affiliate.eml', __FILE__))
       @mail = Mail.new(@raw)
-      @formatter = MessageFormatter.new(@mail)
+      @formatter = Vmail::MessageFormatter.new(@mail)
     end
 
     it "should extract name along with email address" do
@@ -22,7 +22,7 @@ describe Vmail::MessageFormatter do
     before do 
       @raw = File.read(File.expand_path('../fixtures/textbody-nocontenttype.eml', __FILE__))
       @mail = Mail.new(@raw)
-      @formatter = MessageFormatter.new(@mail)
+      @formatter = Vmail::MessageFormatter.new(@mail)
     end
     it "should return the text body" do
       @formatter.process_body.wont_be_nil
@@ -34,7 +34,7 @@ describe Vmail::MessageFormatter do
     before do
       @raw = File.read(File.expand_path('../fixtures/htmlbody.eml', __FILE__))
       @mail = Mail.new(@raw)
-      @formatter = MessageFormatter.new(@mail)
+      @formatter = Vmail::MessageFormatter.new(@mail)
     end
     it "should turn the body into readable text" do
       @formatter.process_body.must_match %r{\n   Web 1 new result for instantwatcher.com netflix}
@@ -45,7 +45,7 @@ describe Vmail::MessageFormatter do
     before do
       @raw = File.read(File.expand_path('../fixtures/euc-kr-header.eml', __FILE__))
       @mail = Mail.new(@raw)
-      @formatter = MessageFormatter.new(@mail)
+      @formatter = Vmail::MessageFormatter.new(@mail)
     end
     it "should know its encoding" do
       @mail.header.charset.must_equal 'euc-kr'
@@ -60,7 +60,7 @@ describe Vmail::MessageFormatter do
     before do 
       @raw = File.read(File.expand_path('../fixtures/moleskine-html.eml', __FILE__))
       @mail = Mail.new(@raw)
-      @formatter = MessageFormatter.new(@mail)
+      @formatter = Vmail::MessageFormatter.new(@mail)
     end
     it "should process body" do
       @formatter.process_body.wont_be_nil

data/vmail.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'mail'
+  s.add_dependency 'highline'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Daniel Choi
@@ -30,6 +30,19 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Manage your email with Vim
 email: 
 - dhchoi@gmail.com
@@ -48,11 +61,12 @@ files:
 - bin/vmail
 - bin/vmail_client
 - gmail.vim
-- lib/contacts_extractor.rb
 - lib/vmail.rb
 - lib/vmail.vim
+- lib/vmail/contacts_extractor.rb
 - lib/vmail/imap_client.rb
 - lib/vmail/message_formatter.rb
+- lib/vmail/options.rb
 - lib/vmail/string_ext.rb
 - lib/vmail/version.rb
 - test/base64_test.rb