vmail 2.8.7 → 2.8.9

data/lib/vmail.rb

@@ -17,7 +17,7 @@ module Vmail
     end
 
     vim = ENV['VMAIL_VIM'] || 'vim'
-    ENV['VMAIL_BROWSER'] ||= if RUBY_PLATFORM.downcase.include?('linux') 
+    ENV['VMAIL_BROWSER'] ||= if RUBY_PLATFORM.downcase.include?('linux')
                                tools = ['gnome-open', 'kfmclient-exec', 'xdg-open', 'konqueror']
                                tool = tools.detect { |tool|
                                  `which #{tool}`.size > 0
@@ -65,9 +65,9 @@ module Vmail
     # require after the working dir is set
     require 'vmail/imap_client'
 
-    drb_uri = begin 
+    drb_uri = begin
                 Vmail::ImapClient.daemon config
-              rescue 
+              rescue
                 puts "Failure:", $!
                 exit(1)
               end
@@ -79,14 +79,16 @@ module Vmail
     server.select_mailbox mailbox
 
     STDERR.puts "Mailbox: #{mailbox}"
-    STDERR.puts "Query: #{query.inspect}" 
+    STDERR.puts "Query: #{query.inspect}"
     STDERR.puts "Query String: #{String.shellescape(query_string)}"
-    
+
     buffer_file = "vmailbuffer"
     # invoke vim
     vimscript = File.expand_path("../vmail.vim", __FILE__)
     vimopts = config['vim_opts']
-    vim_command = "DRB_URI=#{drb_uri} VMAIL_CONTACTS_FILE=#{contacts_file} VMAIL_MAILBOX=#{String.shellescape(mailbox)} VMAIL_QUERY=\"#{query_string}\" #{vim} -S #{vimscript} -c '#{vimopts}' #{buffer_file}"
+    $drb_uri = drb_uri
+    server_name = "VMAIL:#{ config['username'] }"
+    vim_command = "DRB_URI=#{drb_uri} VMAIL_CONTACTS_FILE=#{contacts_file} VMAIL_MAILBOX=#{String.shellescape(mailbox)} VMAIL_QUERY=\"#{query_string}\" #{vim} --servername #{ server_name } -S #{vimscript} -c '#{vimopts}' #{buffer_file}"
     STDERR.puts vim_command
     STDERR.puts "Using buffer file: #{buffer_file}"
     File.open(buffer_file, "w") do |file|
@@ -102,9 +104,9 @@ module Vmail
 
     File.delete(buffer_file)
 
-    STDERR.puts "Closing imap connection"  
+    STDERR.puts "Closing imap connection"
     begin
-      Timeout::timeout(10) do 
+      Timeout::timeout(10) do
         $gmail.close
       end
     rescue Timeout::Error
@@ -129,10 +131,10 @@ module Vmail
   end
 
   def parse_query
-    if ARGV[0] =~ /^\d+/ 
+    if ARGV[0] =~ /^\d+/
       ARGV.shift
     end
-    mailbox = ARGV.shift || 'INBOX' 
+    mailbox = ARGV.shift || 'INBOX'
     query = Vmail::Query.parse(ARGV)
     [mailbox, query]
   end

data/lib/vmail.vim

@@ -282,7 +282,7 @@ function! s:mark_as_read_unread(read) range
   setlocal nomodifiable
   write
   redraw
-  echom nummsgs  ." conversation(s) have been marked as unread."
+  echom nummsgs  ." conversation(s) have been marked as " . (a:read ? "read" : "unread") . "."
 endfunction
 
 function! s:toggle_star() range
@@ -684,6 +684,42 @@ function! s:send_message()
   redraw
 endfunction
 
+" --------------------------------------------------------------------------------
+" Update message list with new emails.
+
+func! UPDATE_MESSAGE_LIST(filename)
+  if s:mailbox == 'INBOX'
+    if bufnr('%') == s:listbufnr
+      call s:update_and_redraw_message_list(a:filename)
+
+    " If current_message is open with message list in another split.
+    elseif bufname('%') == s:message_bufname && index(tabpagebuflist(), s:listbufnr) >= 0
+      let message_bufnr = bufnr('%')
+
+      " Switch to message list window and update it.
+      while bufnr('%') != s:listbufnr | wincmd w | endwhile
+      call s:update_and_redraw_message_list(a:filename)
+
+      while bufnr('%') != message_bufnr | wincmd w | endwhile
+    else
+      call s:update_message_list(a:filename)
+    endif
+  endif
+endfunc
+
+func! s:update_and_redraw_message_list(filename)
+  call s:update_message_list(a:filename)
+  edit!
+  redraw!
+endfunc
+
+func! s:update_message_list(filename)
+  let newer_contents = readfile(a:filename)
+  let older_contents = readfile(s:listbufname)
+  let updated_contents = extend(newer_contents, older_contents)
+  call writefile(updated_contents, s:listbufname)
+endfunc
+
 " --------------------------------------------------------------------------------
 
 " call from inside message window with <Leader>h

data/lib/vmail/address_quoter.rb

@@ -16,17 +16,17 @@ module Vmail
           savebin = part + ", "
         end
       end
-      
+
       #Quote the names
-      addrs.map { |addr| 
+      addrs.map { |addr|
         # a little hackish
         if addr =~ /"/
           addr
         else
-          addr.gsub(/^(.*) (<.*)/, '"\1" \2') 
+          addr.gsub(/^(.*) (<.*)/, '"\1" \2')
         end
       }.join(', ')
     end
-    
+
   end
 end

data/lib/vmail/contacts_extractor.rb

@@ -11,7 +11,7 @@ class ContactsExtractor
     @imap = Net::IMAP.new('imap.gmail.com', 993, true, nil, false)
     puts @imap.login(@username, @password)
     yield @imap
-    @imap.close 
+    @imap.close
     @imap.disconnect
   end
 
@@ -31,10 +31,10 @@ class ContactsExtractor
         recipients = fetch_data.attr["ENVELOPE"].to
         next unless recipients
         recipients.each do |address_struct|
-          email = [address_struct.mailbox, address_struct.host].join('@') 
+          email = [address_struct.mailbox, address_struct.host].join('@')
           name = address_struct.name
-          if name 
-            name = Mail::Encodings.unquote_and_convert_to(name, 'UTF-8') 
+          if name
+            name = Mail::Encodings.unquote_and_convert_to(name, 'UTF-8')
             yield %Q("#{name}" <#{email}>)
           else
             yield email
@@ -46,7 +46,7 @@ class ContactsExtractor
 
   def set_mailbox_prefix
     mailboxes = ((@imap.list("[#@prefix]/", "%") || []) + (@imap.list("", "*")) || []).map {|struct| struct.name}
-    @prefix = mailboxes.detect {|m| m =~ /^\[Google Mail\]/}  ?  "Google Mail" : "Gmail" 
+    @prefix = mailboxes.detect {|m| m =~ /^\[Google Mail\]/}  ?  "Google Mail" : "Gmail"
   end
 end
 end

data/lib/vmail/database.rb

@@ -5,8 +5,8 @@ require 'sequel'
 CREATE_TABLE_SCRIPT = File.expand_path("../../../db/create.sql", __FILE__)
 print "Checking vmail.db version... "
 db = Sequel.connect 'sqlite://vmail.db'
-if db.tables.include?(:version) && 
-    (r = db[:version].first) && 
+if db.tables.include?(:version) &&
+    (r = db[:version].first) &&
     r[:vmail_version] != Vmail::VERSION
 
   print "Vmail database version is outdated. Recreating.\n"

data/lib/vmail/flagging_and_moving.rb

@@ -17,7 +17,7 @@ module Vmail
         log "Deleting uid_set: #{uid_set.inspect}"
         decrement_max_seqno(uid_set.size)
         # for delete, do in a separate thread because deletions are slow
-        spawn_thread_if_tty do 
+        spawn_thread_if_tty do
           unless @mailbox == mailbox_aliases['trash']
             log "imap.uid_copy #{uid_set.inspect} to #{mailbox_aliases['trash']}"
             log @imap.uid_copy(uid_set, mailbox_aliases['trash'])
@@ -27,12 +27,12 @@ module Vmail
           reload_mailbox
           clear_cached_message
         end
-      elsif flg == 'spam' || flg == mailbox_aliases['spam'] 
+      elsif flg == 'spam' || flg == mailbox_aliases['spam']
         log "Marking as spam uid_set: #{uid_set.inspect}"
         decrement_max_seqno(uid_set.size)
-        spawn_thread_if_tty do 
+        spawn_thread_if_tty do
           log "imap.uid_copy #{uid_set.inspect} to #{mailbox_aliases['spam']}"
-          log @imap.uid_copy(uid_set, mailbox_aliases['spam']) 
+          log @imap.uid_copy(uid_set, mailbox_aliases['spam'])
           log "imap.uid_store #{uid_set.inspect} #{action} [:Deleted]"
           log @imap.uid_store(uid_set, action, [:Deleted])
           reload_mailbox
@@ -61,7 +61,7 @@ module Vmail
       end
       create_if_necessary mailbox
       log "Moving uid_set: #{uid_set.inspect} to #{mailbox}"
-      spawn_thread_if_tty do 
+      spawn_thread_if_tty do
         log @imap.uid_copy(uid_set, mailbox)
         log @imap.uid_store(uid_set, '+FLAGS', [:Deleted])
         reload_mailbox
@@ -79,7 +79,7 @@ module Vmail
       end
       create_if_necessary mailbox
       log "Copying #{uid_set.inspect} to #{mailbox}"
-      spawn_thread_if_tty do 
+      spawn_thread_if_tty do
         log @imap.uid_copy(uid_set, mailbox)
         log "Copied uid_set #{uid_set.inspect} to #{mailbox}"
       end

data/lib/vmail/helpers.rb

@@ -26,7 +26,7 @@ module Vmail
         "#{number}#{unit}"
       end
     end
-    
+
 
     def divider(str)
       str * DIVIDER_WIDTH

data/lib/vmail/imap_client.rb

@@ -6,6 +6,7 @@ require 'mail'
 require 'net/imap'
 require 'time'
 require 'logger'
+require 'tempfile'
 require 'vmail/helpers'
 require 'vmail/address_quoter'
 require 'vmail/database'
@@ -32,8 +33,8 @@ module Vmail
       #load user-specified value for from field
       @from = config['from'] || config['username']
       @name = config['name']
-      @signature = config['signature'] 
-      @signature_script = config['signature_script'] 
+      @signature = config['signature']
+      @signature_script = config['signature_script']
       @always_cc = config['always_cc']
       @always_bcc = config['always_bcc']
       @mailbox = nil
@@ -49,7 +50,7 @@ module Vmail
       @authentication = config['authentication'] || 'plain'
       @width = 100
 
-      @date_formatter_this_year = config['date_format'] || '%b %d %I:%M%P' 
+      @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
       current_message = nil
@@ -60,7 +61,7 @@ module Vmail
       @imap = Net::IMAP.new(@imap_server, @imap_port, true, nil, false)
       log @imap.login(@username, @password)
       list_mailboxes # prefetch mailbox list
-    rescue 
+    rescue
       puts "VMAIL_ERROR: #{[$!.message, $!.backtrace].join("\n")}"
     end
 
@@ -86,7 +87,7 @@ module Vmail
         mailbox = mailbox_aliases[mailbox]
       end
       log "Selecting mailbox #{mailbox.inspect}"
-      reconnect_if_necessary(30) do 
+      reconnect_if_necessary(30) do
         log @imap.select(Net::IMAP.encode_utf7(mailbox))
       end
       log "Done"
@@ -106,7 +107,7 @@ module Vmail
       select_mailbox(@mailbox, true)
     end
 
-    # TODO no need for this if all shown messages are stored in SQLITE3 
+    # TODO no need for this if all shown messages are stored in SQLITE3
     # and keyed by UID.
     def clear_cached_message
       return unless STDIN.tty?
@@ -142,23 +143,23 @@ module Vmail
 
     def prime_connection
       return if @ids.nil? || @ids.empty?
-      reconnect_if_necessary(4) do 
+      reconnect_if_necessary(4) do
         # this is just to prime the IMAP connection
-        # It's necessary for some reason before update and deliver. 
+        # It's necessary for some reason before update and deliver.
         log "Priming connection"
         res = @imap.fetch(@ids[-1], ["ENVELOPE"])
         if res.nil?
           # just go ahead, just log
           log "Priming connection didn't work, connection seems broken, but still going ahead..."
         end
-      end 
+      end
     end
 
     def list_mailboxes
       log 'loading mailboxes...'
       @mailboxes ||= (@imap.list("", "*") || []).
         select {|struct| struct.attr.none? {|a| a == :Noselect} }.
-        map {|struct| 
+        map {|struct|
           Net::IMAP.decode_utf7(struct.name)
         }.uniq
       @mailboxes.delete("INBOX")
@@ -217,7 +218,7 @@ module Vmail
       # set a new range filter
       # this may generate a negative rane, e.g., "19893:19992" but that seems harmless
       update_query[0] = "#{old_num_messages}:#{@num_messages}"
-      ids = reconnect_if_necessary { 
+      ids = reconnect_if_necessary {
         log "Search #update_query"
         @imap.search(Vmail::Query.args2string(update_query))
       }
@@ -228,12 +229,24 @@ module Vmail
       self.max_seqno = ids.max
       log "- setting max_seqno to #{self.max_seqno}"
       log "- new uids found: #{new_ids.inspect}"
+      update_message_list(new_ids) unless new_ids.empty?
       new_ids
     end
 
+    def update_message_list(new_ids)
+      new_emails = DRbObject.new_with_uri($drb_uri).update
+      return if new_emails.empty?
+
+      tempfile_path = Tempfile.new('vmail-').path
+      File.open(tempfile_path, 'w') { |file| file.write(new_emails) }
+      server_name = "VMAIL:#{ @username }"
+
+      system(%[vim --servername #{ server_name } --remote-expr 'UPDATE_MESSAGE_LIST("#{ tempfile_path }")'])
+    end
+
     def update
       prime_connection
-      new_ids = check_for_new_messages 
+      new_ids = check_for_new_messages
       if !new_ids.empty?
         @ids = @ids + new_ids
         message_ids = fetch_and_cache_headers(new_ids)
@@ -260,9 +273,9 @@ module Vmail
       with_more_message_line(res)
     end
 
-    def spawn_thread_if_tty(&block) 
+    def spawn_thread_if_tty(&block)
       if STDIN.tty?
-        Thread.new do 
+        Thread.new do
           reconnect_if_necessary(10, &block)
         end
       else
@@ -275,7 +288,7 @@ module Vmail
       if !current_mailboxes.include?(mailbox)
         log "Current mailboxes: #{current_mailboxes.inspect}"
         log "Creating mailbox #{mailbox}"
-        log @imap.create(mailbox) 
+        log @imap.create(mailbox)
         @mailboxes = nil # force reload ...
         list_mailboxes
       end
@@ -338,7 +351,7 @@ module Vmail
         subject = "Fwd: #{subject}"
       end
 
-      new_message_template(subject, false) + 
+      new_message_template(subject, false) +
         "\n---------- Forwarded message ----------\n" +
         original_body + signature
     end
@@ -447,7 +460,7 @@ EOF
       log "Open_html_part"
       log current_mail.parts.inspect
       multipart = current_mail.parts.detect {|part| part.multipart?}
-      html_part = if 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/}
@@ -465,7 +478,7 @@ EOF
       @width = width.to_i
       log "Setting window width to #{width}"
     end
-   
+
     def smtp_settings
       [:smtp, {:address => @smtp_server,
       :port => @smtp_port,
@@ -499,7 +512,7 @@ EOF
       close
       log(revive_connection)
       # hope this isn't an endless loop
-      reconnect_if_necessary do 
+      reconnect_if_necessary do
         block.call
       end
     rescue
@@ -525,11 +538,11 @@ EOF
   end
 end
 
-trap("INT") { 
+trap("INT") {
   require 'timeout'
-  puts "Closing imap connection"  
+  puts "Closing imap connection"
   begin
-    #Timeout::timeout(2) do 
+    #Timeout::timeout(2) do
       # just try to quit
       # $gmail.close
     #end

data/lib/vmail/inbox_poller.rb

@@ -3,9 +3,8 @@ require "vmail/imap_client"
 module Vmail
   class InboxPoller < ImapClient
 
-
     # This is a second IMAP client operating in a separate process
- 
+
     def start_polling
       n = [`which notify-send`.chomp, `which growlnotify`.chomp].detect {|c| c != ''}
       if n
@@ -20,7 +19,7 @@ module Vmail
         log "No notification tool detected. INBOX polling aborted."
         return
       end
-     
+
       sleep 30
       log "INBOX POLLER: started polling"
       @mailboxes.unshift "INBOX"
@@ -34,12 +33,88 @@ module Vmail
     end
 
     def update
-      new_ids = check_for_new_messages 
+      new_ids = check_for_new_messages
       if !new_ids.empty?
         @ids = @ids + new_ids
-	# remove '<>' from email. libnotify can't print '<' 
-        res = uncached_headers(new_ids).map {|m| m[:sender] }.join(", ").tr('<>','')
-        @notifier.call "Vmail: new email", "from " + res
+
+        notification_title = "Vmail: "
+        notification_body = ""
+
+        if new_ids.size == 1
+          # If there is a single email, message is more descriptive about the
+          # received email.
+          #
+          # Example:
+          #
+          #   (title) Vmail: Colin Sullivan
+          #   (body) New Pull request received!
+          #
+          log "single new message received!"
+          new_message = uncached_headers(new_ids)[0]
+
+          # Extract just sender's name from sender field
+          notification_title += new_message[:sender].gsub(/\<.*\>/, "").strip()
+
+          # Truncate message subject if necessary
+          if new_message[:subject].length > 128
+            # Extract first 128 characters from subject of email
+            notification_body += new_message[:subject][0..128] + "..."
+          else
+            notification_body += new_message[:subject]
+          end
+
+        else
+          # If there are multiple new messages, notification is just a brief
+          # listing.
+          #
+          # Example:
+          #
+          #   (title)   Vmail: 3 new messages
+          #   (body)    Colin Sullivan: New Pull request rec...
+          #             Henry Cowell: I am back from the dead!
+          #             ...
+          #
+          log "multiple new messages received!"
+
+          notification_title += new_ids.size.to_s() + " new messages"
+
+          # for each message
+          for i in 0...new_ids.size
+            new_message = uncached_headers(new_ids)[i]
+
+            # Create message line
+            message_line = ""
+
+            # Extract just sender's name from sender field
+            message_line += new_message[:sender].gsub(/\<.*\>/, "").strip()
+
+            # Extract subject
+            message_line += ": " + new_message[:subject]
+
+            # Concatenate line if necessary
+            if message_line.length > 32
+              message_line = message_line[0...29] + "..."
+            end
+
+            # Add to notification body
+            notification_body += message_line + "\n"
+
+          end
+
+          # Concatenate entire notification body if necessary
+          if notification_body.length > 128
+            notification_body = notification_body[0...125] + "..."
+          end
+
+        end
+
+        # Remove any '<>' characters from notification just incase, libnotify
+        # can't print '<'
+        notification_title = notification_title.tr('<>', '')
+        notification_body = notification_body.tr('<>', '')
+
+        @notifier.call notification_title, notification_body
+
       end
     rescue
       log "VMAIL_ERROR: #{[$!.message, $!.backtrace].join("\n")}"
@@ -48,10 +123,10 @@ module Vmail
     # doesn't try to access Sequel / sqlite3
     def uncached_headers(id_set)
       log "Fetching headers for #{id_set.size} messages"
-      results = reconnect_if_necessary do 
+      results = reconnect_if_necessary do
         @imap.fetch(id_set, ["FLAGS", "ENVELOPE", "RFC822.SIZE", "UID"])
       end
-      results.reverse.map do |x| 
+      results.reverse.map do |x|
         envelope = x.attr["ENVELOPE"]
         message_id = envelope.message_id
         subject = Mail::Encodings.unquote_and_convert_to((envelope.subject || ''), 'UTF-8')

data/lib/vmail/message_formatter.rb

@@ -32,13 +32,13 @@ module Vmail
 
     # helper method
     def find_text_part2(part, content_type)
-      if part.multipart?  
+      if part.multipart?
         part.parts.
           map {|p| find_text_part2(p, p.content_type)}.
           compact.
           select {|p| !p.attachment?}.
           first
-      elsif content_type =~ %r[^text/plain] || 
+      elsif content_type =~ %r[^text/plain] ||
         content_type =~ %r[text/plain] ||
         content_type =~ %r[message/rfc]
         part
@@ -47,18 +47,18 @@ module Vmail
 
     def format_part(part)
       if part && part.respond_to?(:header)
-        case part.header["Content-Type"].to_s 
+        case part.header["Content-Type"].to_s
         when /text\/html/
-          format_html_body(part) 
+          format_html_body(part)
         when /text\/plain/
-          format_text_body(part) 
+          format_text_body(part)
         when /message\/rfc/
           m = Mail.new(part.body.decoded)
           plaintext_part(m)
         else # just format_text on it anyway
-          format_text_body(part) 
+          format_text_body(part)
         end
-      else 
+      else
         part.decoded.gsub("\r", '')
       end
     rescue
@@ -73,7 +73,7 @@ module Vmail
     # depend on VMAIL_HTML_PART_READER
     # variable
     def format_html_body(part)
-      html_tool = ENV['VMAIL_HTML_PART_READER'] 
+      html_tool = ENV['VMAIL_HTML_PART_READER']
       html = part.body.decoded.gsub("\r", '')
       stdin, stdout, stderr = Open3.popen3(html_tool)
       stdin.puts html
@@ -107,10 +107,10 @@ module Vmail
 
     def utf8(string, this_encoding = encoding)
       return '' unless string
-      out = if this_encoding && this_encoding.upcase != 'UTF-8' 
+      out = if this_encoding && this_encoding.upcase != 'UTF-8'
               string.encode!('utf-8', this_encoding, undef: :replace, invalid: :replace)
-            elsif this_encoding.upcase == 'UTF-8' 
-              string 
+            elsif this_encoding.upcase == 'UTF-8'
+              string
             else
               # assume UTF-8 and convert to ascii
               string.encode!('us-ascii', 'utf-8', undef: :replace, invalid: :replace)

data/lib/vmail/options.rb

@@ -20,10 +20,10 @@ module Vmail
 
     def parse(argv)
       OptionParser.new do |opts|
-        opts.banner = "Usage:  vmail [ options ] [ limit ] [ imap search query ]" 
+        opts.banner = "Usage:  vmail [ options ] [ limit ] [ imap search query ]"
         opts.separator ""
         opts.separator "Specific options:"
-        opts.on("-g[n]", "--getcontacts[n]", Integer, "Generate contacts file. n is number of emails to scan (default 500).") do |n| 
+        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
@@ -46,7 +46,7 @@ module Vmail
           else
             STDERR.puts <<EOF
 
-Missing config file! 
+Missing config file!
 
 #{INSTRUCTIONS}
 EOF
@@ -75,16 +75,16 @@ EOF
             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| 
+              extractor.extract(@max_messages_to_scan) do |address|
                 STDERR.print '.'
                 file.puts(address.strip)
-                STDERR.flush 
+                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" 
+            cmd = "sort #{DEFAULT_CONTACTS_FILENAME} | uniq > vmail-tmp.txt"
             cmd2 = "mv vmail-tmp.txt #{DEFAULT_CONTACTS_FILENAME}"
             `#{cmd}`
             `#{cmd2}`

data/lib/vmail/query.rb

@@ -10,7 +10,7 @@ module Vmail
       if args.size > 0 && args.first =~ /^\d+/
         args.shift
       end
-      query = if args.empty? 
+      query = if args.empty?
                 ['ALL']
               else
                 args

data/lib/vmail/reply_templating.rb

@@ -22,17 +22,17 @@ module Vmail
       sender = current_message.sender
       reply_quote_header = date ? "On #{date.strftime('%a, %b %d, %Y at %I:%M %p')}, #{sender} wrote:\n\n" : "#{sender} wrote:\n"
 
-      reply_body = reply_quote_header + 
+      reply_body = reply_quote_header +
         ( current_message.plaintext.split(/^-+$/,2)[1].strip.gsub(/^(?=>)/, ">").gsub(/^(?!>)/, "> ") )
 
       {
         'references' => current_message.message_id,
 	# set 'from' to user-specified value
-        'from' => "#@name <#@from>", 
-        'to' => reply_recipient, 
-        'cc' => reply_cc, 
+        'from' => "#@name <#@from>",
+        'to' => reply_recipient,
+        'cc' => reply_cc,
         'bcc' => @always_bcc,
-        'subject' => reply_subject, 
+        'subject' => reply_subject,
         'body' => reply_body
       }
     rescue
@@ -52,12 +52,12 @@ module Vmail
              []
            end
       xs = xs.select {|x|
-        email = (x[/<([^>]+)>/, 1] || x) 
+        email = (x[/<([^>]+)>/, 1] || x)
         email !~ /#{reply_recipient}/ \
           && email !~ /#@username/ \
-          && (@always_cc ? (email !~ /#{@always_cc}/) : true) 
+          && (@always_cc ? (email !~ /#{@always_cc}/) : true)
       }
-      if @always_cc 
+      if @always_cc
         xs << @always_cc
       end
       xs.uniq.select {|x| x != reply_recipient }.join(', ')

data/lib/vmail/searching.rb

@@ -3,7 +3,7 @@ module Vmail
     # The main function called by the client to retrieve messages
     def search(query)
       log "#search: #{query.inspect}"
-      @query = Vmail::Query.parse(query) 
+      @query = Vmail::Query.parse(query)
       # customizable @limit is Deprecated
       @limit = 100
 
@@ -13,10 +13,10 @@ module Vmail
         @ids = reconnect_if_necessary(180) do # timeout of 3 minutes
           @imap.search(query_string)
         end
-        @start_index = [@ids.size - @limit, 0].max 
+        @start_index = [@ids.size - @limit, 0].max
       else
         # set the target range to the whole set, unless it is too big
-        @start_index = [@num_messages - @limit, 0].max 
+        @start_index = [@num_messages - @limit, 0].max
         @query.unshift "#{@start_index + 1}:#{@num_messages}"
         query_string = Vmail::Query.args2string(@query)
         log "Query: #{query_string.inspect}"
@@ -30,7 +30,7 @@ module Vmail
       end
 
       self.max_seqno = @ids[-1] # this is a instance var
-      log "- Query got #{@ids.size} results; max seqno: #{self.max_seqno}" 
+      log "- Query got #{@ids.size} results; max seqno: #{self.max_seqno}"
       clear_cached_message
 
       select_ids = (search_query? ? @ids[[-@limit, 0].max, @limit] : @ids)
@@ -51,7 +51,7 @@ module Vmail
     rescue
       log "ERROR:\n#{$!.inspect}\n#{$!.backtrace.join("\n")}"
       "Sorry there was an error. Please check vmail.log."
-    end  
+    end
 
     def search_query?
       x = @query[-1] != 'all'

data/lib/vmail/send_options.rb

@@ -5,7 +5,7 @@ module Vmail
 
     def parse(argv)
       OptionParser.new do |opts|
-        opts.banner = "Usage:  vmailsend" 
+        opts.banner = "Usage:  vmailsend"
         opts.separator ""
         opts.separator "Specific options:"
         opts.on("-c", "--config path", String, "Path to config file") do |config_file|
@@ -30,7 +30,7 @@ module Vmail
           else
             puts <<EOF
 
-Missing config file! 
+Missing config file!
 
 #{INSTRUCTIONS}
 EOF

data/lib/vmail/showing_headers.rb

@@ -3,7 +3,7 @@ module Vmail
   module ShowingHeaders
 
     def get_message_headers(message_ids)
-      messages = message_ids.map {|message_id| 
+      messages = message_ids.map {|message_id|
         m = Message[message_id]
         if m.nil?
           raise "Message #{message_id} not found"
@@ -16,10 +16,10 @@ module Vmail
 
     def fetch_and_cache_headers(id_set)
       log "Fetching headers for #{id_set.size} messages"
-      results = reconnect_if_necessary do 
+      results = reconnect_if_necessary do
         @imap.fetch(id_set, ["FLAGS", "ENVELOPE", "RFC822.SIZE", "UID"])
       end
-      results.reverse.map do |x| 
+      results.reverse.map do |x|
         envelope = x.attr["ENVELOPE"]
         message_id = envelope.message_id
         begin
@@ -60,10 +60,10 @@ module Vmail
     def extract_address(address_struct)
       address = if address_struct.nil?
                   "Unknown"
-                else 
-                  email = [ (address_struct.mailbox ? Mail::Encodings.unquote_and_convert_to(address_struct.mailbox, 'UTF-8') : ""), 
+                else
+                  email = [ (address_struct.mailbox ? Mail::Encodings.unquote_and_convert_to(address_struct.mailbox, 'UTF-8') : ""),
                       (address_struct.host ?  Mail::Encodings.unquote_and_convert_to(address_struct.host, 'UTF-8'): "")
-                    ].join('@') 
+                    ].join('@')
                   if address_struct.name
                    "#{Mail::Encodings.unquote_and_convert_to((address_struct.name || ''), 'UTF-8')} <#{email}>"
                   else
@@ -77,7 +77,7 @@ module Vmail
       date = DateTime.parse(message.date)
       formatted_date = if date.year != Time.now.year
                          date.strftime @date_formatter_prev_years
-                       else 
+                       else
                          date.strftime @date_formatter_this_year
                        end
       address = if @mailbox == mailbox_aliases['sent']
@@ -92,8 +92,8 @@ module Vmail
       row_text = [ format_flags(message.flags).col(2),
                    (formatted_date || '').col(@date_width),
                    address.col(address_col_width),
-                   message.subject.col(subject_col_width), 
-                   number_to_human_size(message.size).rcol(7), 
+                   message.subject.col(subject_col_width),
+                   number_to_human_size(message.size).rcol(7),
                    message.message_id ].join(' | ')
     end
 
@@ -108,11 +108,11 @@ module Vmail
     end
 
     def with_more_message_line(res)
-      remaining = @start_index 
+      remaining = @start_index
       if remaining <= 1
         return res
       end
-      res + "\n>  Load #{[100, remaining].min} more messages. #{remaining} remaining." 
+      res + "\n>  Load #{[100, remaining].min} more messages. #{remaining} remaining."
     end
 
   end

data/lib/vmail/showing_message.rb

@@ -26,7 +26,7 @@ module Vmail
     def show_message(message_id, raw=false)
       message_id = message_id.strip.gsub('\\', '')
       log "Show message: #{message_id.inspect}"
-      return current_message.rfc822 if raw 
+      return current_message.rfc822 if raw
       res = retry_if_needed { fetch_and_cache(message_id) }
       log "Showing message message_id: #{message_id}"
       @cur_message_id = message_id
@@ -35,10 +35,10 @@ module Vmail
 
     def fetch_and_cache(message_id)
       if message = cached_full_message?(message_id)
-        log "- full message cache hit"        
+        log "- full message cache hit"
         return message.plaintext
       end
-      log "- full message cache miss"        
+      log "- full message cache miss"
       params = {message_id: message_id, label_id: @label.label_id}
       labeling = Labeling[params] || Labeling.create(params)
       unless (labeling && labeling.uid)
@@ -48,13 +48,13 @@ module Vmail
       end
       uid = labeling.uid
 
-      log "- fetching message uid #{uid}"        
-      fetch_data = reconnect_if_necessary do 
+      log "- fetching message uid #{uid}"
+      fetch_data = reconnect_if_necessary do
         res = retry_if_needed do
           @imap.uid_fetch(uid, ["FLAGS", "RFC822", "RFC822.SIZE"])
         end
         raise "Message uid #{uid} could not be fetched from server" if res.nil?
-        res[0] 
+        res[0]
       end
       seqno = fetch_data.seqno
       rfc822 = Mail.new(fetch_data.attr['RFC822'])
@@ -63,7 +63,7 @@ module Vmail
       message = Message[message_id]
       parts_list = format_parts_info(formatter.list_parts)
       headers_hash = formatter.extract_headers
-      headers_hash['date'] 
+      headers_hash['date']
       headers = format_headers headers_hash
       # replace the date value with the one derived from the envelope
       body = formatter.plaintext_part
@@ -88,7 +88,7 @@ EOF
       end
 
       begin
-        message.update(:plaintext => message_text) 
+        message.update(:plaintext => message_text)
       rescue
         log message_text.encoding
         #log message_text
@@ -96,7 +96,7 @@ EOF
       end
       message_text
     rescue
-      msg = "Error encountered in fetch_and_cache(), message_id #{message_id} [#{@mailbox}]:\n#{$!}\n#{$!.backtrace.join("\n")}" 
+      msg = "Error encountered in fetch_and_cache(), message_id #{message_id} [#{@mailbox}]:\n#{$!}\n#{$!.backtrace.join("\n")}"
       log msg
       msg
     end

data/lib/vmail/version.rb

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

data/test/address_quoter_test.rb

@@ -15,20 +15,20 @@ class AddressQuoterTest < MiniTest::Unit::TestCase
     assert_equal @expected, quote_addresses(@string)  #=> "Bob Smith" <bobsmith@gmail.com>, "Jones, Rich A." <richjones@gmail.com>
     assert_equal @expected2, quote_addresses(@string2)  #=> "Bob Smith" <bobsmith@gmail.com>, "Jones, Rich A." <richjones@gmail.com>
   end
-  
+
   def test_quoting_with_bare_email_address
     string = "richjones@gmail.com"
-    assert_equal string, quote_addresses(string)  
+    assert_equal string, quote_addresses(string)
 
     string = "Bob Smith <bobsmith@gmail.com>, Jones, Rich A. <richjones@gmail.com>, peterbaker@gmail.com"
     expected = %q("Bob Smith" <bobsmith@gmail.com>, "Jones, Rich A." <richjones@gmail.com>, peterbaker@gmail.com)
-    assert_equal expected, quote_addresses(string)  
+    assert_equal expected, quote_addresses(string)
   end
 
   def test_quoting_already_quoted
     string = %q(Bob Smith <bobsmith@gmail.com>, "Jones, Rich A." <richjones@gmail.com>, peterbaker@gmail.com)
     expected = %q("Bob Smith" <bobsmith@gmail.com>, "Jones, Rich A." <richjones@gmail.com>, peterbaker@gmail.com)
-    assert_equal expected, quote_addresses(string)  
+    assert_equal expected, quote_addresses(string)
   end
 
 end

data/test/message_formatter_test.rb

@@ -19,7 +19,7 @@ describe Vmail::MessageFormatter do
   end
 
   describe "message has a text body but no Content-Type" do
-    before do 
+    before do
       @raw = File.read(File.expand_path('../fixtures/textbody-nocontenttype.eml', __FILE__))
       @mail = Mail.new(@raw)
       @formatter = Vmail::MessageFormatter.new(@mail)
@@ -52,12 +52,12 @@ describe Vmail::MessageFormatter do
     end
     it "should format the subject line in UTF-8" do
       match = "독특닷컴과"
-      assert_match match, @formatter.extract_headers['subject'] 
+      assert_match match, @formatter.extract_headers['subject']
     end
   end
 
   describe "when message has only an HTML body and no encoding info" do
-    before do 
+    before do
       @raw = File.read(File.expand_path('../fixtures/moleskine-html.eml', __FILE__))
       @mail = Mail.new(@raw)
       @formatter = Vmail::MessageFormatter.new(@mail)
@@ -69,12 +69,12 @@ describe Vmail::MessageFormatter do
 
   describe "when message has two attachments" do
     before do
-      @raw  = read_fixture('with-attachments.eml') 
+      @raw  = read_fixture('with-attachments.eml')
       @mail = Mail.new(@raw)
     end
 
     it "should extract two attachments" do
-      attachments = @mail.attachments 
+      attachments = @mail.attachments
       assert_equal 2, attachments.size
       assert_equal ['image/png', 'image/gif'], attachments.map(&:mime_type)
     end
@@ -88,7 +88,7 @@ describe Vmail::MessageFormatter do
     end
 
     it 'should extract the message/rfc822 part' do
-      assert_match /I hope everyone is having a great holiday season/, 
+      assert_match /I hope everyone is having a great holiday season/,
         @formatter.process_body
     end
   end

data/test/notifier_test.rb

@@ -0,0 +1,35 @@
+gem "minitest"
+require 'minitest/autorun'
+require 'vmail/version'
+require 'vmail/options'
+require 'vmail/inbox_poller'
+
+describe Vmail::InboxPoller do
+  before do
+    working_dir = ENV['VMAIL_HOME'] || "#{ENV['HOME']}/.vmail/default"
+    Dir.chdir(working_dir)
+    opts = Vmail::Options.new(["--config", ".vmailrc"])
+    opts.config
+    config = opts.config
+    @inbox_poller = Vmail::InboxPoller.start config
+    @notifier = @inbox_poller.initialize_notifier
+  end
+
+  after do
+    @inbox_poller.close
+  end
+
+  describe "test notifications" do
+    it "does not fail" do
+      @notifier.call "This is a simple notification title", "This is a simple body"
+    end
+  end
+
+  describe "when a notification contains single quotes" do
+    it "does not fail" do
+      res = @notifier.call "Someone's notification", "Shouldn't fail with single quotes"
+
+      print "res: #{res}"
+    end
+  end
+end

data/test/reply_template_test.rb

@@ -22,7 +22,7 @@ describe Vmail::ReplyTemplating do
       expected = "Draculette Ko <violinist.ko@gmail.com>, Cookiemonster Youn <cookiemonster@gmail.com>, Racoon <raycoon@gmail.com>"
       assert_equal expected, @rt.cc
     end
-    
+
     def test_sender
       assert_equal "Chappy Youn <chappy1@gmail.com>", @rt.sender
     end

metadata

@@ -1,83 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: vmail
 version: !ruby/object:Gem::Version
-  version: 2.8.7
+  version: 2.8.9
+  prerelease: 
 platform: ruby
 authors:
 - Daniel Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.12
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.24.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: versionomy
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
 description: Manage your email with Vim
@@ -134,47 +145,34 @@ files:
 - test/fixtures/textbody-nocontenttype.eml
 - test/fixtures/with-attachments.eml
 - test/message_formatter_test.rb
+- test/notifier_test.rb
 - test/reply_template_test.rb
 - test/test_helper.rb
 - test/time_format_test.rb
 - vmail.gemspec
 homepage: http://danielchoi.com/software/vmail.html
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: vmail
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A Vim interface to Gmail
-test_files:
-- test/address_quoter_test.rb
-- test/base64_test.rb
-- test/fixtures/euc-kr-header.eml
-- test/fixtures/euc-kr-html.eml
-- test/fixtures/google-affiliate.eml
-- test/fixtures/htmlbody.eml
-- test/fixtures/moleskine-html.eml
-- test/fixtures/reply-template-encoding-test.eml
-- test/fixtures/reply_all.eml
-- test/fixtures/rfc_part.eml
-- test/fixtures/textbody-nocontenttype.eml
-- test/fixtures/with-attachments.eml
-- test/message_formatter_test.rb
-- test/reply_template_test.rb
-- test/test_helper.rb
-- test/time_format_test.rb
+test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 3518bf85a7fa7234e20959f21d38d38673ccd756
-  data.tar.gz: 074a00c8760160288c904d9307745315276d713b
-SHA512:
-  metadata.gz: a3e3c4c7d7328851e93a2b42c3c925a88d0cb587d736dc364e092e95d98ba58f57eda872fe9c8e964e23eba0f7699ee5e7579c48d8b8b9afdc88253d8b4f5a9b
-  data.tar.gz: 3890f56ce913f779e89e5d6155dc4e6381c670359926e1929e95b38570f42d145999540e57ee76bbc581fe6020839ad942e7e1e628ace978f70307e1755a8a18