vmail 0.0.4 → 0.0.5

data/NOTES

@@ -475,33 +475,25 @@ DONE
 - map u update from message window      
 - do search after loading vim or mvim and send size first
 - vim resize event
-
-next:
+- mvim - window width corrected
+- delete mvmail command. just use env variable - cleaner
 - sending an attachment
   - can specify a directory, then all the items in the directory get
     attached and sent
-- forwarding attachments
+
+next:
+- forwarding with attachments
   - could be "attach: [uid] attachments to signal"
-- put instructions in message window; put in a top section 
-  - help /readme
-  - help document should just be readme? or part of it.
+- 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
-  - get rid of config file
-- use temp files
-  - tempname()
-  - system() allows a parameters that is written to tmp file and passed
-    to stdin
 - 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
 - ,s s confusion? Star vs search
 - 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 - starred messages not syntax colored
 - 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?)
@@ -523,6 +515,10 @@ later:
 - sometimes update doesn't work - bug
 - show total messages from a search, showing 100
 - message threads
+- use temp files
+  - tempname()
+  - system() allows a parameters that is written to tmp file and passed
+    to stdin
 
 
 

data/README.markdown

@@ -22,7 +22,7 @@ The format of the yaml file is as follows:
       Sent via vmail. http://danielchoi.com
 
 Start the program by typing `vmail` on your command line. If you want to use the Macvim 
-version, type `mvmail`.
+version, `export VMAIL_VIM=mvim` first.
 
 There is no real documentation as of yet, but here are the raw vimscript mappings
 

data/lib/vmail.vim

@@ -97,6 +97,7 @@ function! s:show_message()
   redraw
 endfunction
 
+" from message window
 function! s:show_next_message()
   call s:focus_list_window()
   execute "normal j"
@@ -105,12 +106,26 @@ endfunction
 
 function! s:show_previous_message()
   call s:focus_list_window()
- execute "normal k" 
- if line('.') != 1
-   execute "normal \<cr>"
- endif
+  execute "normal k" 
+  if line('.') != 1
+    execute "normal \<cr>"
+  endif
+endfunction
+
+" from message list window
+function! s:show_next_message_in_list()
+  if line('.') != line('$')
+    call feedkeys("j\<cr>\<cr>") 
+  endif
+endfunction
+
+function! s:show_previous_message_in_list()
+  if line('.') != 1
+    call feedkeys("k\<cr>\<cr>") 
+  endif
 endfunction
 
+
 " invoked from withint message window
 function! s:show_raw()
   let command = s:show_message_command . s:current_uid . ' raw'
@@ -169,11 +184,11 @@ function! s:update()
     redraw
     call cursor(line + 1, 0)
     normal z.
-    echom "you have " . num . " new message" . (num == 1 ? '' : 's') . "!" 
-    redrawstatus
+    redraw
+    echo "you have " . num . " new message" . (num == 1 ? '' : 's') . "!" 
   else
-    echom "no new messages"
-    redrawstatus
+    redraw
+    echo "no new messages"
   endif
 endfunction
 
@@ -510,7 +525,7 @@ function! s:cancel_compose()
   close!
 endfunction
 
-function! s:deliver_message()
+function! s:send_message()
   write
   let mail = join(getline(1,'$'), "\n")
   exec ":!" . s:deliver_command . " < ComposeMessage" 
@@ -546,8 +561,8 @@ func! s:save_attachments()
   end
   let s:savedir = input("save attachments to directory: ", s:savedir)
   let command = s:save_attachments_command . s:savedir
-  echo command
   let res = system(command)
+  echo res
 endfunc
 " -------------------------------------------------------------------------------- 
 
@@ -608,15 +623,16 @@ func! s:message_list_window_mappings()
   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
+  noremap <silent> <buffer> <c-j> :call <SID>show_next_message_in_list()<cr>
+  noremap <silent> <buffer> <c-k> :call <SID>show_previous_message_in_list()<cr>
   nnoremap <silent> <buffer> <Space> :call <SID>toggle_fullscreen()<cr>
 endfunc
 
 func! s:compose_window_mappings()
-  " NOTE deliver_message is a global mapping, so user can load a saved
+  " NOTE send_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>
+  nnoremap <silent> <Leader>vs :call <SID>send_message()<CR>
+  nnoremap <silent> <buffer> <Leader>vd :call <SID>save_draft()<CR>
   noremap <silent> <buffer> <leader>q :call <SID>cancel_compose()<cr>
   nmap <silent> <buffer> q <leader>q
 endfunc

data/lib/vmail/imap_client.rb

@@ -378,12 +378,7 @@ EOF
     def new_mail_from_input(text)
       require 'mail'
       mail = Mail.new
-      raw_headers, body = *text.split(/\n\s*\n/, 2)
-      # handle attachments
-      if (attachments = body.split(/\n\s*\n/, 2)[0]) =~ /^attach:/
-        # TODO
-        log "attachments: #{YAML::load(attachments).inspect}"
-      end
+      raw_headers, raw_body = *text.split(/\n\s*\n/, 2)
       headers = {}
       raw_headers.split("\n").each do |line|
         key, value = *line.split(/:\s*/, 2)
@@ -397,7 +392,27 @@ EOF
       mail.bcc = headers['bcc'] #&& headers['cc'].split(/,\s+/)
       mail.subject = headers['subject']
       mail.from ||= @username
-      mail.body = body
+      # attachments are added as a snippet of YAML after a blank line
+      # after the headers, and followed by a blank line
+      if (attachments = raw_body.split(/\n\s*\n/, 2)[0]) =~ /^attach(ment|ments)*:/
+        # TODO
+        files = YAML::load(attachments).values.flatten
+        log "attachments: #{files}"
+        files.each do |file|
+          if File.directory?(file)
+            Dir.glob("#{file}/*").each {|f| mail.add_file(f) if File.size?(f)}
+          else
+            mail.add_file(file) if File.size?(file)
+          end
+        end
+        mail.text_part do
+          body raw_body.split(/\n\s*\n/, 2)[1]
+        end
+      else
+        mail.text_part do
+          body raw_body
+        end
+      end
       mail
     end
 
@@ -409,11 +424,13 @@ EOF
       return unless dir && @current_mail
       attachments = @current_mail.attachments
       `mkdir -p #{dir}`
-      attachments.each do |x|
+      saved = attachments.map do |x|
         path = File.join(dir, x.filename)
         log "saving #{path}"
         File.open(path, 'wb') {|f| f.puts x.decoded}
+        path
       end
+      "saved:\n" + saved.map {|x| "- #{x}"}.join("\n")
     end
 
     def open_html_part(uid)

data/lib/vmail/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Daniel Choi
@@ -34,7 +34,6 @@ description: Manage your email with Vim
 email: 
 - dhchoi@gmail.com
 executables: 
-- mvmail
 - vmail
 - vmail_client
 extensions: []
@@ -46,7 +45,6 @@ files:
 - NOTES
 - README.markdown
 - Rakefile
-- bin/mvmail
 - bin/vmail
 - bin/vmail_client
 - gmail.vim

data/bin/mvmail

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-begin
-  require 'vmail'
-rescue LoadError
-  require 'rubygems'
-  require 'gmail'
-end
-
-ENV['VMAIL_VIM'] = 'mvim'
-Vmail.start
-