vmail 0.0.3 → 0.0.4

data/NOTES

@@ -467,6 +467,14 @@ DONE
   window. redirect streams from daemon to a log file
 - package gem
   - vmail (client)
+- mvim = allow using through VMAIL_EDITOR env variable
+- need to put mailbox and search on status line from startup
+- c-j c-k to go to prev/next message
+- turn search into an input() style prompt
+- remember and show last search
+- map u update from message window      
+- do search after loading vim or mvim and send size first
+- vim resize event
 
 next:
 - sending an attachment
@@ -474,11 +482,9 @@ next:
     attached and sent
 - forwarding attachments
   - could be "attach: [uid] attachments to signal"
-- use :wq to send compose message, not ,d (easy to confuse with delete!)
-  - close! to cancel
-  - fewer mappings to remember this way
 - put instructions in message window; put in a top section 
-- map u update from message window      
+  - help /readme
+  - help document should just be readme? or part of it.
 - follow mysql and use -u and -p flags on startup of server?
   - omitting -p flag forces prompt
   - get rid of config file
@@ -486,21 +492,18 @@ next:
   - tempname()
   - system() allows a parameters that is written to tmp file and passed
     to stdin
-- help document should just be readme? or part of it.
 - print all selected messages into file (append)
   - can pipe through a command line tool, so we don't need to clutter
     viewer.vim with more mappings and functions
-- put "move to >" and "select mailbox >" in command window
-- make compat with ruby 1.8
-- help
-- readme
 - ,s s confusion? Star vs search
-- sort contacts by frequency, then take first 10 or so of any match
-  group
-  - enhance contacts auto fix with more advance vim script
-- mvim = allow using through VMAIL_EDITOR env variable
+- enhance contacts auto fix with more advanced vim script
+  - sort contacts by frequency, then take first 10 or so of any match
+- mvim - window width not correct
+- mvim - starred messages not syntax colored
 
 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)
@@ -518,6 +521,7 @@ later:
   - do fast action like deletes
 - reload after window resize
 - sometimes update doesn't work - bug
+- show total messages from a search, showing 100
 - message threads
 
 

data/Rakefile

@@ -3,12 +3,10 @@ require 'rake/testtask'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-task :environment do
-  require(File.join(File.dirname(__FILE__), 'config', 'environment'))
-end
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib')
 
 desc "Run tests"
-task :test => :environment do 
+task :test do 
   $:.unshift File.expand_path("test")
   require 'test_helper'
   require 'time_format_test'

data/lib/vmail.rb

@@ -4,33 +4,37 @@ module Vmail
   extend self
 
   def start
+    vim = ENV['VMAIL_VIM'] || 'vim'
+
     config = YAML::load(File.read(File.expand_path("~/gmail.yml")))
-    config.merge! 'logfile' => "vmail.log"
+    logfile = (vim == 'mvim') ? STDERR : 'vmail.log'
+    config.merge! 'logfile' => logfile
 
     puts "starting vmail imap client with config #{config}"
 
     drb_uri = Vmail::ImapClient.daemon config
 
     server = DRbObject.new_with_uri drb_uri
+
+    # TODO this is useless if we're using mvim
     server.window_width = `stty size`.strip.split(' ')[1]
-    server.select_mailbox ARGV.shift || 'INBOX'
 
-    query = ARGV.empty? ? [100, 'ALL'] : nil
+    mailbox = ARGV.shift || 'INBOX'
+    server.select_mailbox mailbox
 
+    query = ARGV.empty? ? [100, 'ALL'] : ARGV
+    puts "mailbox: #{mailbox}"
+    puts "query: #{query.inspect}"
     
-    buffer_file = "vmail-buffer.txt"
+    buffer_file = "vmailbuffer.txt"
     puts "using buffer file: #{buffer_file}"
     File.open(buffer_file, "w") do |file|
-      file.puts server.search(*query)
+      file.puts "just a moment..."  
     end
 
     # invoke vim
-    # TODO
-    #  - mvim; move viewer.vim to new file
-
-    vim = ENV['VMAIL_VIM'] || 'vim'
     vimscript = File.expand_path("../vmail.vim", __FILE__)
-    vim_command = "DRB_URI='#{drb_uri}' #{vim} -S #{vimscript} #{buffer_file}"
+    vim_command = "DRB_URI='#{drb_uri}' 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

@@ -1,13 +1,12 @@
-let s:mailbox = ''
-let s:num_msgs = 0 " number of messages
-let s:query = ''
+let s:mailbox = $VMAIL_MAILBOX
+let s:query = $VMAIL_QUERY
 
 let s:drb_uri = $DRB_URI
 
 let s:client_script = "vmail_client " . s:drb_uri . " "
-let s:window_width_command = s:client_script . "window_width= "
+let s:set_window_width_command = s:client_script . "window_width= "
 let s:list_mailboxes_command = s:client_script . "list_mailboxes "
-let s:lookup_command = s:client_script . "lookup "
+let s:show_message_command = s:client_script . "show_message "
 let s:update_command = s:client_script . "update"
 let s:fetch_headers_command = s:client_script . "fetch_headers "
 let s:select_mailbox_command = s:client_script . "select_mailbox "
@@ -26,7 +25,7 @@ let s:message_bufname = "MessageWindow"
 let s:list_bufname = "MessageListWindow"
 
 function! VmailStatusLine()
-  return "%<%f\ " . s:mailbox . "%r%=%-14.(%l,%c%V%)\ %P"
+  return "%<%f\ " . s:mailbox . " " . s:query . "%r%=%-14.(%l,%c%V%)\ %P"
 endfunction
 
 function! s:create_list_window()
@@ -47,6 +46,7 @@ function! s:create_list_window()
   " we need the bufnr to find the window later
   let s:listbufnr = bufnr('%')
   setlocal statusline=%!VmailStatusLine()
+  call s:message_list_window_mappings()
 endfunction
 
 " the message display buffer window
@@ -56,28 +56,7 @@ function! s:create_message_window()
   " setlocal noswapfile
   " setlocal nobuflisted
   let s:message_window_bufnr = bufnr('%')
-  " message window bindings
-  noremap <silent> <buffer> <cr> :call <SID>focus_list_window()<CR> 
-  noremap <silent> <buffer> <Leader>q :call <SID>focus_list_window()<CR> 
-  noremap <silent> <buffer> q <Leader>q
-  noremap <silent> <buffer> <Leader>r :call <SID>compose_reply(0)<CR>
-  noremap <silent> <buffer> <Leader>a :call <SID>compose_reply(1)<CR>
-  noremap <silent> <buffer> <Leader>R :call <SID>show_raw()<cr>
-  noremap <silent> <buffer> <Leader>R :call <SID>show_raw()<cr>
-  noremap <silent> <buffer> <Leader>f :call <SID>compose_forward()<CR><cr>
-  " TODO improve this
-  noremap <silent> <buffer> <Leader>o yE :!open '<C-R>"'<CR><CR>
-  noremap <silent> <buffer> <leader>j :call <SID>show_next_message()<CR> 
-  noremap <silent> <buffer> <leader>k :call <SID>show_previous_message()<CR> 
-  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>m :call <SID>focus_list_window()<cr>:call <SID>mailbox_window()<CR>
-  nnoremap <silent> <buffer> <Leader>A :call <SID>save_attachments()<cr>
-  " go fullscreen
-  nnoremap <silent> <buffer> <Space> :call <SID>toggle_fullscreen()<cr>
+  call s:message_window_mappings()
   close
 endfunction
 
@@ -101,8 +80,9 @@ function! s:show_message()
   redraw
   let selected_uid = matchstr(line, '^\d\+')
   let s:current_uid = selected_uid
-  let command = s:lookup_command . s:current_uid
-  echo "Loading message. Please wait..."
+  let command = s:show_message_command . s:current_uid
+  echom "Loading message. Please wait..."
+  redrawstatus
   let res = system(command)
   call s:focus_message_window()
   setlocal modifiable
@@ -133,7 +113,7 @@ endfunction
 
 " invoked from withint message window
 function! s:show_raw()
-  let command = s:lookup_command . s:current_uid . ' raw'
+  let command = s:show_message_command . s:current_uid . ' raw'
   echo command
   setlocal modifiable
   1,$delete
@@ -178,7 +158,7 @@ endfunction
 " gets new messages since last update
 function! s:update()
   let command = s:update_command
-  echo command
+  echo "checking for new messages. please wait..."
   let res = system(command)
   if match(res, '^\d\+') != -1
     setlocal modifiable
@@ -189,11 +169,11 @@ function! s:update()
     redraw
     call cursor(line + 1, 0)
     normal z.
-    redraw
-    echo "you have " . num . " new message" . (num == 1 ? '' : 's') . "!" 
+    echom "you have " . num . " new message" . (num == 1 ? '' : 's') . "!" 
+    redrawstatus
   else
-    redraw
-    echo "no new messages"
+    echom "no new messages"
+    redrawstatus
   endif
 endfunction
 
@@ -215,7 +195,11 @@ function! s:toggle_star() range
     let action = " -FLAGS"
   endif
   let command = s:flag_command . uid_set . action . " Flagged" 
-  echo command
+  if len(uids) == 1
+    echom "toggling flag on message " . uid_set
+  else
+    echom "toggling flags on messages " . join(uid_set, ",")
+  endif
   " toggle [*] on lines
   let res = system(command)
   setlocal modifiable
@@ -383,7 +367,6 @@ function! s:select_mailbox()
   endif
   let s:mailbox = mailbox
   let command = s:select_mailbox_command . shellescape(s:mailbox)
-  echo command
   call system(command)
   redraw
   " now get latest 100 messages
@@ -400,19 +383,15 @@ function! s:select_mailbox()
   normal z.
 endfunction
 
-function! s:search_window()
-  topleft split SearchWindow
-  setlocal buftype=nofile
-  setlocal noswapfile
-  resize 1
-  setlocal modifiable
-  noremap! <silent> <buffer> <cr> <Esc>:call <SID>do_search()<CR> 
-  call feedkeys("i")
-endfunction
+func! s:search_query()
+  if !exists("s:query")
+    let s:query = ""
+  endif
+  let s:query = input("search query: ", s:query)
+  call s:do_search()
+endfunc
 
 function! s:do_search()
-  let s:query = getline(line('.'))
-  close
   " empty query
   if match(s:query, '^\s*$') != -1
     return
@@ -420,12 +399,21 @@ function! s:do_search()
   " close message window if open
   call s:focus_message_window()
   close
-  " TODO should we really hardcode 100 as the quantity?
-  let command = s:search_command . "100 " . shellescape(s:query)
-  echo command
+  " if query doesn't start with a number, set max returned to 100
+  let limit = 100
+  let imap_query = s:query
+  if match(s:query, '^\d') == 0
+    let query_chunks = split(s:query, '\s')
+    let limit = remove(query_chunks, 0)
+    let imap_query = join(query_chunks, ' ')
+  end
+  let s:query = limit . ' ' . imap_query
+  let command = s:search_command . limit . ' ' . shellescape(imap_query)
+  redraw
   call s:focus_list_window()  
-  let res = system(command)
   setlocal modifiable
+  echo "running query on " . s:mailbox . ": " . s:query . ". please wait..."
+  let res = system(command)
   1,$delete
   put! =res
   execute "normal Gdd\<c-y>" 
@@ -491,10 +479,7 @@ func! s:open_compose_window(command)
   1,$delete
   put! =res
   normal 1G
-  noremap <silent> <buffer> <Leader>d :call <SID>deliver_message()<CR>
-  nnoremap <silent> <buffer> q :call <SID>cancel_compose()<cr>
-  nnoremap <silent> <buffer> <leader>q :call <SID>cancel_compose()<cr>
-  nnoremap <silent> <buffer> <Leader>s :call <SID>save_draft()<CR>
+  call s:compose_window_mappings()
   set completefunc=CompleteContact
 endfunc
 
@@ -514,7 +499,7 @@ function! CompleteContact(findstart, base)
     return start
   else
     " find contacts matching with "a:base"
-    let matches = system("grep " . shellescape(a:base) . " contacts.txt")
+    let matches = system("grep -i " . shellescape(a:base) . " contacts.txt")
     return split(matches, "\n")
   endif
 endfun
@@ -575,49 +560,80 @@ func! s:toggle_fullscreen()
   endif
 endfunc
 
-call s:create_list_window()
 
-call s:create_message_window()
-
-call s:focus_list_window() " to go list window
-" this are list window bindings
-
-noremap <silent> <buffer> <cr> :call <SID>show_message()<CR>
-noremap <silent> <buffer> q :qal!<cr>
+" -------------------------------------------------------------------------------- 
+" MAPPINGS
 
-noremap <silent> <buffer> s :call <SID>toggle_star()<CR>
-noremap <silent> <buffer> <leader>d :call <SID>delete_messages("Deleted")<CR>
+func! s:message_window_mappings()
+  noremap <silent> <buffer> <cr> :call <SID>focus_list_window()<CR> 
+  noremap <silent> <buffer> <Leader>r :call <SID>compose_reply(0)<CR>
+  noremap <silent> <buffer> <Leader>a :call <SID>compose_reply(1)<CR>
+  noremap <silent> <buffer> <Leader>R :call <SID>show_raw()<cr>
+  noremap <silent> <buffer> <Leader>R :call <SID>show_raw()<cr>
+  noremap <silent> <buffer> <Leader>f :call <SID>compose_forward()<CR><cr>
+  " TODO improve this
+  noremap <silent> <buffer> <Leader>o yE :!open '<C-R>"'<CR><CR>
+  noremap <silent> <buffer> <c-j> :call <SID>show_next_message()<CR> 
+  noremap <silent> <buffer> <c-k> :call <SID>show_previous_message()<CR> 
+  nmap <silent> <buffer> <leader>j <c-j>
+  nmap <silent> <buffer> <leader>k <c-k>
+  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> 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>
+  " go fullscreen
+  nnoremap <silent> <buffer> <Space> :call <SID>toggle_fullscreen()<cr>
+endfunc
 
-" 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")
+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>delete_messages("[Gmail]/Spam")<CR>
+  "open a link browser (os x)
+  "autocmd CursorMoved <buffer> call <SID>show_message()
+  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>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>
+  " go fullscreen
+  nnoremap <silent> <buffer> <Space> :call <SID>toggle_fullscreen()<cr>
+endfunc
 
-noremap <silent> <buffer> <leader>! :call <SID>delete_messages("[Gmail]/Spam")<CR>
+func! s:compose_window_mappings()
+  " NOTE deliver_message is a global mapping, so user can load a saved
+  " message from a file and send it
+  nnoremap <silent> <Leader>vd :call <SID>deliver_message()<CR>
+  nnoremap <silent> <buffer> <Leader>vs :call <SID>save_draft()<CR>
+  noremap <silent> <buffer> <leader>q :call <SID>cancel_compose()<cr>
+  nmap <silent> <buffer> q <leader>q
+endfunc
 
-"open a link browser (os x)
-"autocmd CursorMoved <buffer> call <SID>show_message()
+call s:create_list_window()
 
-noremap <silent> <buffer> u :call <SID>update()<CR>
-noremap <silent> <buffer> <Leader>s :call <SID>search_window()<CR>
-noremap <silent> <buffer> <Leader>m :call <SID>mailbox_window()<CR>
-noremap <silent> <buffer> <Leader>v :call <SID>move_to_mailbox()<CR>
+call s:create_message_window()
 
-noremap <silent> <buffer> <Leader>c :call <SID>compose_message()<CR>
+call s:focus_list_window() " to go list window
 
-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>
+" send window width
+call system(s:set_window_width_command . winwidth(1))
 
-" go fullscreen
-nnoremap <silent> <buffer> <Space> :call <SID>toggle_fullscreen()<cr>
+autocmd VimResized <buffer> call system(s:set_window_width_command . winwidth(1))
 
-" press double return in list view to go full screen on a message; then
-" return? again to restore the list view
+call system(s:select_mailbox_command . shellescape(s:mailbox))
+call s:do_search()
 
-" go to bottom and center cursorline
-normal G
-normal z.
 
-" send window width
-" system(s:set_window_width_command . winwidth(1))
 

data/lib/vmail/imap_client.rb

@@ -26,7 +26,8 @@ module Vmail
       @mailbox = nil
       @logger = Logger.new(config['logfile'] || STDERR)
       @logger.level = Logger::DEBUG
-      @current_message = nil
+      @current_mail = nil
+      @current_uid = nil
     end
 
     def open
@@ -127,7 +128,7 @@ module Vmail
       subject = Mail::Encodings.unquote_and_convert_to(subject, 'utf-8')
       flags = format_flags(flags)
       first_col_width = max_uid.to_s.length 
-      mid_width = @width - (first_col_width + 14 + 2) - (10 + 2) - 5
+      mid_width = @width - (first_col_width + 33)
       address_col_width = (mid_width * 0.3).ceil
       subject_col_width = (mid_width * 0.7).floor
       [uid.to_s.col(first_col_width), 
@@ -154,7 +155,6 @@ module Vmail
       end
     end
 
-
     FLAGMAP = {:Flagged => '[*]'}
     # flags is an array like [:Flagged, :Seen]
     def format_flags(flags)
@@ -222,22 +222,24 @@ module Vmail
       res 
     end
 
-    def lookup(uid, raw=false, forwarded=false)
-      if raw
-        return @current_message.to_s
-      end
-      log "fetching #{uid.inspect}"
+    def show_message(uid, raw=false, forwarded=false)
+      uid = uid.to_i
+      return @current_mail.to_s if raw 
+      return @current_message if uid == @current_uid
+      log "fetching #{uid.inspect}" 
       fetch_data = reconnect_if_necessary do 
-        @imap.uid_fetch(uid.to_i, ["FLAGS", "RFC822", "RFC822.SIZE"])[0]
+        @imap.uid_fetch(uid, ["FLAGS", "RFC822", "RFC822.SIZE"])[0]
       end
       res = fetch_data.attr["RFC822"]
-      mail = Mail.new(res)
-      @current_message = mail # used later to show raw message or extract attachments if any
-      formatter = MessageFormatter.new(mail)
+      mail = Mail.new(res) 
+      @current_uid = uid
+      @current_mail = mail # used later to show raw message or extract attachments if any
+      log "saving current mail with parts: #{@current_mail.parts.inspect}"
+      formatter = Vmail::MessageFormatter.new(mail)
       part = formatter.find_text_part
       out = formatter.process_body 
       size = fetch_data.attr["RFC822.SIZE"]
-      message = <<-EOF
+      @current_message = <<-EOF
 #{@mailbox} #{uid} #{number_to_human_size size} #{forwarded ? nil : format_parts_info(formatter.list_parts)}
 ----------------------------------------
 #{format_headers(formatter.extract_headers)}
@@ -324,7 +326,7 @@ EOF
         select {|x| @username !~ /#{x.mailbox}@#{x.host}/}.
         map {|x| address_to_string(x)}.join(", ")
       mail = Mail.new fetch_data.attr['RFC822']
-      formatter = MessageFormatter.new(mail)
+      formatter = Vmail::MessageFormatter.new(mail)
       headers = formatter.extract_headers
       subject = headers['subject']
       if subject !~ /Re: /
@@ -349,7 +351,7 @@ EOF
 
     # TODO, forward with attachments 
     def forward_template(uid)
-      original_body = lookup(uid, false, true)
+      original_body = show_message(uid, false, true)
       new_message_template + 
         "\n---------- Forwarded message ----------\n" +
         original_body + signature
@@ -401,11 +403,11 @@ EOF
 
     def save_attachments(dir)
       log "save_attachments #{dir}"
-      if !@current_message
+      if !@current_mail
         log "missing a current message"
       end
-      return unless dir && @current_message
-      attachments = @current_message.attachments
+      return unless dir && @current_mail
+      attachments = @current_mail.attachments
       `mkdir -p #{dir}`
       attachments.each do |x|
         path = File.join(dir, x.filename)
@@ -416,10 +418,16 @@ EOF
 
     def open_html_part(uid)
       log "open_html_part #{uid}"
-      fetch_data = @imap.uid_fetch(uid.to_i, ["RFC822"])[0]
-      mail = Mail.new(fetch_data.attr['RFC822'])
-      multipart = mail.parts.detect {|part| part.multipart?}
-      html_part = (multipart || mail).parts.detect {|part| part.header["Content-Type"].to_s =~ /text\/html/}
+      log @current_mail.parts.inspect
+      multipart = @current_mail.parts.detect {|part| part.multipart?}
+      html_part = if multipart 
+                    multipart.parts.detect {|part| part.header["Content-Type"].to_s =~ /text\/html/}
+                  elsif ! @current_mail.parts.empty?
+                    @current_mail.parts.detect {|part| part.header["Content-Type"].to_s =~ /text\/html/}
+                  else
+                    @current_mail.body
+                  end
+      return if html_part.nil?
       outfile = 'htmlpart.html'
       File.open(outfile, 'w') {|f| f.puts(html_part.decoded)}
       # client should handle opening the html file

data/lib/vmail/message_formatter.rb

@@ -2,112 +2,114 @@ require 'mail'
 require 'open3'
 require 'iconv'
 
-class MessageFormatter
-  # initialize with a Mail object
-  def initialize(mail, uid = nil)
-    @mail = mail
-    @uid = uid
-  end
-
-  def list_parts(parts = (@mail.parts.empty? ? [@mail] : @mail.parts))
-    if parts.empty?
-      return []
+module Vmail
+  class MessageFormatter
+    # initialize with a Mail object
+    def initialize(mail, uid = nil)
+      @mail = mail
+      @uid = uid
     end
-    lines = parts.map do |part|
-      if part.multipart?
-        list_parts(part.parts)
-      else
-        # part.charset could be used
-        "- #{part.content_type}"
+
+    def list_parts(parts = (@mail.parts.empty? ? [@mail] : @mail.parts))
+      if parts.empty?
+        return []
+      end
+      lines = parts.map do |part|
+        if part.multipart?
+          list_parts(part.parts)
+        else
+          # part.charset could be used
+          "- #{part.content_type}"
+        end
       end
+      lines.flatten
     end
-    lines.flatten
-  end
 
-  def process_body
-    part = find_text_part(@mail.parts)
-    body = if part && part.respond_to?(:header)
-      if part.header["Content-Type"].to_s =~ /text\/plain/
-        format_text_body(part) 
-      elsif part.header["Content-Type"].to_s =~ /text\/html/
-        format_html_body(part) 
-      else
-        format_text_body(part) 
+    def process_body
+      part = find_text_part(@mail.parts)
+      body = if part && part.respond_to?(:header)
+        if part.header["Content-Type"].to_s =~ /text\/plain/
+          format_text_body(part) 
+        elsif part.header["Content-Type"].to_s =~ /text\/html/
+          format_html_body(part) 
+        else
+          format_text_body(part) 
+        end
+      else 
+        "NO BODY" 
       end
-    else 
-      "NO BODY" 
+    rescue
+      puts $!
+      body
     end
-  rescue
-    puts $!
-    body
-  end
 
-  def find_text_part(parts = @mail.parts)
-    if parts.empty?
-      return @mail
-    end
-    part = parts.detect {|part| part.multipart?}
-    if part
-      find_text_part(part.parts)
-    else
-      # no multipart part
-      part = parts.detect {|part| (part.header["Content-Type"].to_s =~ /text\/plain/) }
+    def find_text_part(parts = @mail.parts)
+      if parts.empty?
+        return @mail
+      end
+      part = parts.detect {|part| part.multipart?}
       if part
-        return part
+        find_text_part(part.parts)
       else
-        parts.first
+        # no multipart part
+        part = parts.detect {|part| (part.header["Content-Type"].to_s =~ /text\/plain/) }
+        if part
+          return part
+        else
+          parts.first
+        end
       end
     end
-  end
 
-  def format_text_body(part)
-    text = part.body.decoded.gsub("\r", '')
-    charset = part.content_type_parameters && part.content_type_parameters['charset']
-    if charset
-      Iconv.conv('utf-8//translit//ignore', charset, text)
-    else
-      text
+    def format_text_body(part)
+      text = part.body.decoded.gsub("\r", '')
+      charset = part.content_type_parameters && part.content_type_parameters['charset']
+      if charset
+        Iconv.conv('utf-8//translit//ignore', charset, text)
+      else
+        text
+      end
     end
-  end
-
-  # depend on lynx
-  def format_html_body(part)
-    html = part.body.decoded.gsub("\r", '')
-    stdin, stdout, stderr = Open3.popen3("lynx -stdin -dump")
-    stdin.puts html
-    stdin.close
-    output = stdout.read
-    charset = part.content_type_parameters && part.content_type_parameters['charset']
-    charset ?  Iconv.conv('utf-8//translit//ignore', charset, output) : output
-  end
 
-  def extract_headers(mail = @mail)
-    headers = {'from' => utf8(mail['from'].decoded),
-      'date' => (mail.date.strftime('%a, %b %d %I:%M %p %Z %Y') rescue mail.date),
-      'to' => mail['to'].nil? ? nil : utf8(mail['to'].decoded),
-      'subject' => utf8(mail.subject)
-    }
-    if !mail.cc.nil?
-      headers['cc'] = utf8(mail['cc'].decoded.to_s)
+    # depend on lynx
+    def format_html_body(part)
+      html = part.body.decoded.gsub("\r", '')
+      stdin, stdout, stderr = Open3.popen3("lynx -stdin -dump")
+      stdin.puts html
+      stdin.close
+      output = stdout.read
+      charset = part.content_type_parameters && part.content_type_parameters['charset']
+      charset ?  Iconv.conv('utf-8//translit//ignore', charset, output) : output
     end
-    if !mail.reply_to.nil?
-      headers['reply_to'] = utf8(mail['reply_to'].decoded)
+
+    def extract_headers(mail = @mail)
+      headers = {'from' => utf8(mail['from'].decoded),
+        'date' => (mail.date.strftime('%a, %b %d %I:%M %p %Z %Y') rescue mail.date),
+        'to' => mail['to'].nil? ? nil : utf8(mail['to'].decoded),
+        'subject' => utf8(mail.subject)
+      }
+      if !mail.cc.nil?
+        headers['cc'] = utf8(mail['cc'].decoded.to_s)
+      end
+      if !mail.reply_to.nil?
+        headers['reply_to'] = utf8(mail['reply_to'].decoded)
+      end
+      headers
+    rescue
+      {'error' => $!}
     end
-    headers
-  rescue
-    {'error' => $!}
-  end
 
-  def encoding
-    @encoding ||= @mail.header.charset || 'utf-8'
-  end
+    def encoding
+      @encoding ||= @mail.header.charset || 'utf-8'
+    end
 
-  def utf8(string)
-    return '' unless string
-    return string unless encoding
-    Iconv.conv('utf-8//translit/ignore', encoding, string)
-  rescue
-    puts $!
-    string
+    def utf8(string)
+      return '' unless string
+      return string unless encoding
+      Iconv.conv('utf-8//translit/ignore', encoding, string)
+    rescue
+      puts $!
+      string
+    end
   end
 end

data/lib/vmail/string_ext.rb

@@ -6,6 +6,24 @@ class String
   def rcol(width) #right justified
     self[0,width].rjust(width)
   end
+
+  def self.shellescape(str)
+    # An empty argument will be skipped, so return empty quotes.
+    return "''" if str.empty?
+
+    str = str.dup
+
+    # Process as a single byte sequence because not all shell
+    # implementations are multibyte aware.
+    str.gsub!(/([^A-Za-z0-9_\-.,:\/@\n])/n, "\\\\\\1")
+
+    # A LF cannot be escaped with a backslash because a backslash + LF
+    # combo is regarded as line continuation and simply ignored.
+    str.gsub!(/\n/, "'\n'")
+
+    return str
+  end
+
 end
 
 

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/message_formatter_test.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 require 'test_helper'
+require 'vmail/message_formatter'
 
-describe MessageFormatter do
+describe Vmail::MessageFormatter do
   describe "message with email addresses along with names" do
     before do
       @raw = File.read(File.expand_path('../fixtures/google-affiliate.eml', __FILE__))

data/test/test_helper.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../config/environment', __FILE__)
-
 require 'minitest/spec'
 require 'minitest/unit'
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Daniel Choi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 -05:00
+date: 2010-12-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,11 +49,8 @@ files:
 - bin/mvmail
 - bin/vmail
 - bin/vmail_client
-- config/environment.rb
-- config/gmail.orig.yml
 - gmail.vim
 - lib/contacts_extractor.rb
-- lib/gmail.rb
 - lib/vmail.rb
 - lib/vmail.vim
 - lib/vmail/imap_client.rb

data/config/environment.rb

@@ -1,18 +0,0 @@
-# configure activerecord to use mysql
-#require 'active_record'
-require 'logger'
-require 'yaml'
-require 'net/imap'
-require 'mail'
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
-#config_file = File.join(File.dirname(__FILE__), 'database.yml')
-#config = YAML::load(File.read(config_file))['development']
-#ActiveRecord::Base.establish_connection config
-
-gmail_config_file = File.join(File.dirname(__FILE__), 'gmail.yml')
-gmail_config = YAML::load(File.read(gmail_config_file))
-require 'gmail'
-$gmail = Gmail.new gmail_config['login'], gmail_config['password']
-
-require 'message_formatter'

data/config/gmail.orig.yml

@@ -1,8 +0,0 @@
-login: dhchoi@gmail.com
-name: Daniel Choi
-password: somepassword
-signature: |
-  --
-  Sent via vmail. http://danielchoi.com
-drb_uri: druby://127.0.0.1:61676
-

data/lib/gmail.rb

@@ -1,145 +0,0 @@
-require 'net/imap'
-
-class Gmail
-  DEMARC = "------=gmail-tool="
-
-  def initialize(username, password)
-    @username, @password = username, password
-  end
-
-  def open
-    raise "block missing" unless block_given?
-    @imap = Net::IMAP.new('imap.gmail.com', 993, true, nil, false)
-    @imap.login(@username, @password)
-    yield @imap
-  rescue Exception => ex
-    raise
-  ensure
-    if @imap
-      @imap.close rescue Net::IMAP::BadResponseError
-      @imap.disconnect
-    end
-  end
-
-  # lists mailboxes
-  def mailboxes
-    open do |imap|
-      imap.list("[Gmail]/", "%") + imap.list("", "%")
-    end
-  end
-
-  # selects the mailbox and returns self
-  def mailbox(x)
-    @mailbox = x
-    # allow chaining
-    return self 
-  end
-
-  def fetch(opts = {})
-    num_messages = opts[:num_messages] || 10
-    mailbox_label = opts[:mailbox] || @mailbox || 'inbox'
-    query = opts[:query] || ["ALL"]
-    open do |imap|
-      imap.select(mailbox_label)
-      all_uids = imap.uid_search(query)
-      STDERR.puts "#{all_uids.size} UIDS TOTAL"
-      uids = all_uids[-([num_messages, all_uids.size].min)..-1] || []
-      STDERR.puts "imap process uids #{uids.inspect}"
-      yield imap, uids
-    end
-  end
-
-  # generic mailbox operations
-  def imap
-    open do |imap|
-      imap.select((@mailbox || 'inbox'))
-      yield imap
-    end
-  end
-end
-
-
-class String
-  def col(width)
-    self[0,width].ljust(width)
-  end
-end
-
-def format_time(x)
-  Time.parse(x.to_s).localtime.strftime "%D %I:%M%P"
-end
-
-require 'time'
-
-def search
-  mailbox = ARGV.shift 
-  num_messages = ARGV.shift.to_i 
-  #query = ["BODY", "politics"]
-  query = ARGV
-  puts mailbox
-  $gmail.mailbox(mailbox).fetch(:num_messages => num_messages, :query => query) do |imap,uids|
-    uids.each do |uid|
-      res = imap.uid_fetch(uid, ["FLAGS", "BODY", "ENVELOPE", "RFC822.HEADER"])[0]
-      #puts res.inspect
-      #puts res
-      header = res.attr["RFC822.HEADER"]
-      mail = Mail.new(header)
-      mail_id = uid
-      flags = res.attr["FLAGS"]
-      puts "#{mail_id} #{format_time(mail.date.to_s)} #{mail.from[0][0,30].ljust(30)} #{mail.subject.to_s[0,70].ljust(70)} #{flags.inspect.col(30)}"
-
-      next
-
-      mail = Mail.new(res)
-      foldline = [mail[:from], mail[:date], mail[:subject]].join(" ")
-      puts foldline + " {{{1"
-      if mail.parts.empty?
-        puts mail.body.decoded
-      else
-        puts mail.parts.inspect
-      end
-    end
-  end
-end
-
-def lookup(raw=false)
-  mailbox, uid = *ARGV[0,2]
-  $gmail.mailbox(mailbox).imap do |imap|
-    res = imap.uid_fetch(uid.to_i, ["FLAGS", "RFC822"])[0].attr["RFC822"]
-    if raw
-      puts res
-      return
-    end
-    mail =  Mail.new(res)
-    if mail.parts.empty?
-      puts mail.header["Content-Type"]
-      puts mail.body.charset
-      puts mail.body.decoded 
-    else
-      puts mail.parts.inspect
-      part = mail.parts.detect {|part| 
-        (part.header["Content-Type"].to_s =~ /text\/plain/)
-      }
-      if part
-        puts "PART"
-        puts part.header["Content-Type"]
-        puts part.charset
-        puts part.body.decoded
-      end
-    end
-  end
-end
-
-if __FILE__ == $0
-  require 'yaml'
-  require 'mail'
-  config = YAML::load(File.read(File.expand_path("../../config/gmail.yml", __FILE__)))
-  $gmail = Gmail.new(config['login'], config['password'])
-  if ARGV.length == 2
-    lookup
-  elsif ARGV[2] == 'raw'
-    lookup(raw=true)
-  else
-    search
-  end
-end