vmail 2.9.4 → 2.9.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGJjNmNjNmJiZmZmODFhYTgxMzE2MGQ3MTA0NDUzOWEwZDExYzM3OA==
+    MjBhZmJmZTlkMDU0NjcwYTk1N2VhNWQxYWY5MjEzYWM5NDFjN2JiYg==
   data.tar.gz: !binary |-
-    ZjU0OThlOWMzZThhNGJjNTFlOTU0NzEwYWFmMmZmY2JjYmQzMGU1NA==
+    ZWMxMDI3NDg1NTg5NDNkZmY5MTlmY2JhMWZiOTE2YWIzZmI4ZDUxNg==
 SHA512:
   metadata.gz: !binary |-
-    MTg0M2E1ZjQ4OTkyNzk1Mzg0MzgyZDNhYTg4MWZjYzFjMjAxODMxNWIwOTcy
-    MDljYWJhZDFjODE2MzFjZjFkZTVmN2M2ZjFmNGM1M2Y2ZGMzMGJhZjA0OTQ2
-    N2U1ZTI2OWI5NDlhNjAyMzE1ODU2YzQ4Njc2ZTA4MDU0OWY3ZDQ=
+    YWI4OTRkZjQ3MDg5YzQ2OThhYWM0MTUyODczNzRjOWMxNzU4OGI1NjFjNTU0
+    N2MzNDJmZDc0ZmQ3YmIwMTg3MjI1Mzk0NjY4NTc2NzU1MDE0MTFmZWUxODgw
+    MjkxYmQ2MmNlODU3ZThhMGIxNzA2ZGRmODc5MjI3NjA1YzBlMzM=
   data.tar.gz: !binary |-
-    Y2M2NmQyNWQ0MGJmOTMzMTIyMWUyZGFkOTY4YmVkNzRjNTMwMTE4MzYwZGIx
-    OTg4NjE2NzdlNzQyMjNkNjUyYTljMmI3ZWE2MzUzZTNmNDQxMTMzNDBjMjhi
-    NTNjNzZkMmI5ZDA4ZmY5Y2QwZWVjNGYyNmNlYzliNDk3YmM4Y2E=
+    NzY0MTUwZWViZDcyYzViNTA4ZDJjOWJlNGJlM2M1OGY3ZjFlZjliM2ZlMjhl
+    ZjFmZDNhMTVkODk0ZWQwMzM1MWI4MDNhNjJlY2IzYmExMDAxZWFiOGVmYmM3
+    M2E0MTBkMmJkMzI3OTUyM2QwOWM4ZWI4Y2JiYTdiMzU1MDg0NTk=

data/lib/vmail.rb

@@ -7,20 +7,102 @@ require 'versionomy'
 module Vmail
   extend self
 
+  BUFFER_FILE = 'vmailbuffer'
+
   def start
-    puts "Starting vmail #{Vmail::VERSION}"
+    puts "Starting vmail #{ Vmail::VERSION }"
+    check_ruby_version
+
+    set_vmail_browser
+    check_html_reader
+    change_directory_to_vmail_home
+
+    logfile = (vim == 'mvim' || vim == 'gvim') ? STDERR : 'vmail.log'
+    config.merge! 'logfile' => logfile
+
+    puts "Starting vmail imap client for #{ config['username'] }"
+
+    set_inbox_poller
+
+    puts "Working directory: #{ Dir.pwd }"
+
+    server = start_imap_daemon
+    mailbox, query_string = select_mailbox(server)
+
+    start_vim(mailbox, query_string)
+
+    if vim == 'mvim' || vim == 'gvim'
+      DRb.thread.join
+    end
+
+    close_connection
+  end
+
+  private
+
+  def options
+    @options ||= Vmail::Options.new(ARGV)
+  end
+
+  def config
+    @config ||= options.config
+  end
+
+  def change_directory_to_vmail_home
+    working_dir = ENV['VMAIL_HOME'] || "#{ ENV['HOME'] }/.vmail/default"
+    `mkdir -p #{ working_dir }`
+    puts "Changing working directory to #{ working_dir }"
+    Dir.chdir(working_dir)
+  end
+
+  def check_html_reader
+    return if ENV['VMAIL_HTML_PART_READER']
+    html_reader = %w( w3m elinks lynx ).detect {|x| `which #{ x }` != ''}
+    if html_reader
+      cmd = ['w3m -dump -T text/html -I utf-8 -O utf-8', 'lynx -stdin -dump', 'elinks -dump'].detect {|s| s.index(html_reader)}
+      STDERR.puts "Setting VMAIL_HTML_PART_READER to '#{ cmd }'"
+      ENV['VMAIL_HTML_PART_READER'] = cmd
+    else
+      abort "You need to install w3m, elinks, or lynx on your system in order to see html-only messages"
+    end
+  end
+
+  def parse_query
+    if ARGV[0] =~ /^\d+/
+      ARGV.shift
+    end
+    mailbox = ARGV.shift || 'INBOX'
+    query = Vmail::Query.parse(ARGV)
+    [mailbox, query]
+  end
+
+  def select_mailbox(server)
+    mailbox, query = parse_query
+    query_string = Vmail::Query.args2string query
+    server.select_mailbox mailbox
+
+    STDERR.puts "Mailbox: #{ mailbox }"
+    STDERR.puts "Query: #{ query.inspect }"
+    STDERR.puts "Query String: #{ String.shellescape(query_string) }"
+
+    [mailbox, query_string]
+  end
+
+  def check_ruby_version
     required_version = Versionomy::create(:major => 1, :minor => 9, :tiny => 0)
     ruby_version = Versionomy::parse(RUBY_VERSION)
+
     if required_version > ruby_version
       puts "This version of vmail requires Ruby version 1.9.0 or higher (1.9.2 is recommended)"
       exit
     end
+  end
 
-    vim = ENV['VMAIL_VIM'] || 'vim'
+  def set_vmail_browser
     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
+                                 `which #{ tool }`.size > 0
                                }
                                if tool.nil?
                                  puts "Can't find a VMAIL_BROWSER tool on your system. Please report this issue."
@@ -31,25 +113,10 @@ module Vmail
                                'open'
                              end
 
-    puts "Setting VMAIL_BROWSER to '#{ENV['VMAIL_BROWSER']}'"
-    check_html_reader
-
-    working_dir = ENV['VMAIL_HOME'] || "#{ENV['HOME']}/.vmail/default"
-    `mkdir -p #{working_dir}`
-    puts "Changing working directory to #{working_dir}"
-    Dir.chdir(working_dir)
-    opts = Vmail::Options.new(ARGV)
-    opts.config
-    config = opts.config
-
-    contacts_file = opts.contacts_file
-
-    logfile = (vim == 'mvim' || vim == 'gvim') ? STDERR : 'vmail.log'
-    config.merge! 'logfile' => logfile
-
-    puts "Starting vmail imap client for #{config['username']}"
+    puts "Setting VMAIL_BROWSER to '#{ ENV['VMAIL_BROWSER'] }'"
+  end
 
-    # inbox poller
+  def set_inbox_poller
     if config['polling'] == true
       require 'vmail/inbox_poller'
       inbox_poller = Vmail::InboxPoller.start config
@@ -59,60 +126,50 @@ module Vmail
     else
       puts "INBOX polling disabled."
     end
+  end
 
-    puts "Working directory: #{Dir.pwd}"
-
+  def start_imap_daemon
     # require after the working dir is set
     require 'vmail/imap_client'
 
-    drb_uri = begin
+    $drb_uri = begin
                 Vmail::ImapClient.daemon config
               rescue
                 puts "Failure:", $!
                 exit(1)
               end
 
-    server = DRbObject.new_with_uri drb_uri
-
-    mailbox, query = parse_query
-    query_string = Vmail::Query.args2string query
-    server.select_mailbox mailbox
-
-    STDERR.puts "Mailbox: #{mailbox}"
-    STDERR.puts "Query: #{query.inspect}"
-    STDERR.puts "Query String: #{String.shellescape(query_string)}"
+    DRbObject.new_with_uri $drb_uri
+  end
 
-    buffer_file = "vmailbuffer"
-    # invoke vim
+  def start_vim(mailbox, query_string)
     vimscript = File.expand_path("../vmail.vim", __FILE__)
     vimopts = config['vim_opts']
-    $drb_uri = drb_uri
     server_name = "VMAIL:#{ config['username'] }"
+    contacts_file = options.contacts_file
 
     vim_options = {
-      'DRB_URI' => drb_uri,
+      'DRB_URI' => $drb_uri,
       'VMAIL_CONTACTS_FILE' => contacts_file,
       'VMAIL_MAILBOX' => String.shellescape(mailbox),
       'VMAIL_QUERY' => %("#{ query_string }")
     }
 
-    vim_command = "#{vim} --servername #{ server_name } -S #{vimscript} -c '#{vimopts}' #{buffer_file}"
+    vim_command = "#{ vim } --servername #{ server_name } -S #{ vimscript } -c '#{ vimopts }' #{ BUFFER_FILE }"
 
     STDERR.puts vim_options
     STDERR.puts vim_command
-    STDERR.puts "Using buffer file: #{buffer_file}"
-    File.open(buffer_file, "w") do |file|
-      file.puts "\n\nVmail #{Vmail::VERSION}\n\n"
+    STDERR.puts "Using buffer file: #{ BUFFER_FILE }"
+    File.open(BUFFER_FILE, "w") do |file|
+      file.puts "\n\nVmail #{ Vmail::VERSION }\n\n"
       file.puts "Please wait while I fetch your messages.\n\n\n"
     end
 
     system(vim_options, vim_command)
+  end
 
-    if vim == 'mvim' || vim == 'gvim'
-      DRb.thread.join
-    end
-
-    File.delete(buffer_file)
+  def close_connection
+    File.delete(BUFFER_FILE)
 
     STDERR.puts "Closing imap connection"
     begin
@@ -126,27 +183,8 @@ module Vmail
     exit
   end
 
-  private
-
-  def check_html_reader
-    return if ENV['VMAIL_HTML_PART_READER']
-    html_reader = %w( w3m elinks lynx ).detect {|x| `which #{x}` != ''}
-    if html_reader
-      cmd = ['w3m -dump -T text/html -I utf-8 -O utf-8', 'lynx -stdin -dump', 'elinks -dump'].detect {|s| s.index(html_reader)}
-      STDERR.puts "Setting VMAIL_HTML_PART_READER to '#{cmd}'"
-      ENV['VMAIL_HTML_PART_READER'] = cmd
-    else
-      abort "You need to install w3m, elinks, or lynx on your system in order to see html-only messages"
-    end
-  end
-
-  def parse_query
-    if ARGV[0] =~ /^\d+/
-      ARGV.shift
-    end
-    mailbox = ARGV.shift || 'INBOX'
-    query = Vmail::Query.parse(ARGV)
-    [mailbox, query]
+  def vim
+    ENV['VMAIL_VIM'] || 'vim'
   end
 end
 

data/lib/vmail/contacts_extractor.rb

@@ -4,7 +4,7 @@ require 'vmail/defaults'
 module Vmail
 class ContactsExtractor
   def initialize(username, password, mailbox_config)
-    puts "Logging as #{username}"
+    puts "Logging as #{ username }"
     @username, @password = username, password
 
     @sent_mailbox = mailbox_config && mailbox_config['sent']
@@ -23,13 +23,13 @@ class ContactsExtractor
     open do |imap|
       set_mailbox_prefix
       mailbox = "[#@prefix]/#@sent_mailbox"
-      STDERR.puts "Selecting #{mailbox}"
+      STDERR.puts "Selecting #{ mailbox }"
       imap.select(mailbox)
-      STDERR.puts "Fetching last #{limit} sent messages"
+      STDERR.puts "Fetching last #{ limit } sent messages"
       all_uids = imap.uid_search('ALL')
-      STDERR.puts "Total messages: #{all_uids.size}"
+      STDERR.puts "Total messages: #{ all_uids.size }"
       limit = [limit, all_uids.size].min
-      STDERR.puts "Extracting addresses from #{limit} of them"
+      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
@@ -39,7 +39,7 @@ class ContactsExtractor
           name = address_struct.name
           if name
             name = Mail::Encodings.unquote_and_convert_to(name, 'UTF-8')
-            yield %Q("#{name}" <#{email}>)
+            yield %Q("#{ name }" <#{ email }>)
           else
             yield email
           end

data/lib/vmail/database.rb

@@ -11,14 +11,14 @@ if db.tables.include?(:version) &&
 
   print "Vmail database version is outdated. Recreating.\n"
   `rm vmail.db`
-  `sqlite3 vmail.db < #{CREATE_TABLE_SCRIPT}`
+  `sqlite3 vmail.db < #{ CREATE_TABLE_SCRIPT }`
 else
   print "OK\n"
 end
 db.disconnect
 
 if !File.size?('vmail.db')
-  puts `sqlite3 vmail.db < #{CREATE_TABLE_SCRIPT}`
+  puts `sqlite3 vmail.db < #{ CREATE_TABLE_SCRIPT }`
 end
 
 DB = Sequel.connect 'sqlite://vmail.db'

data/lib/vmail/flagging_and_moving.rb

@@ -12,36 +12,36 @@ module Vmail
     # action is -FLAGS or +FLAGS
     def flag(message_ids, action, flg)
       uid_set = convert_to_message_ids(message_ids)
-      log "Flag #{uid_set} #{flg} #{action}"
+      log "Flag #{ uid_set } #{ flg } #{ action }"
       if flg == 'Deleted'
-        log "Deleting uid_set: #{uid_set.inspect}"
+        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
           unless @mailbox == mailbox_aliases['trash']
-            log "imap.uid_copy #{uid_set.inspect} to #{mailbox_aliases['trash']}"
+            log "imap.uid_copy #{ uid_set.inspect } to #{ mailbox_aliases['trash'] }"
             log @imap.uid_copy(uid_set, mailbox_aliases['trash'])
           end
-          log "imap.uid_store #{uid_set.inspect} #{action} [#{flg.to_sym}]"
+          log "imap.uid_store #{ uid_set.inspect } #{ action } [#{ flg.to_sym }]"
           log @imap.uid_store(uid_set, action, [flg.to_sym])
           reload_mailbox
           clear_cached_message
         end
       elsif flg == 'spam' || flg == mailbox_aliases['spam']
-        log "Marking as spam uid_set: #{uid_set.inspect}"
+        log "Marking as spam uid_set: #{ uid_set.inspect }"
         decrement_max_seqno(uid_set.size)
         spawn_thread_if_tty do
-          log "imap.uid_copy #{uid_set.inspect} to #{mailbox_aliases['spam']}"
+          log "imap.uid_copy #{ uid_set.inspect } to #{ 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.inspect } #{ action } [:Deleted]"
           log @imap.uid_store(uid_set, action, [:Deleted])
           reload_mailbox
           clear_cached_message
         end
       else
-        log "Flagging uid_set: #{uid_set.inspect}"
+        log "Flagging uid_set: #{ uid_set.inspect }"
         spawn_thread_if_tty do
-          log "imap.uid_store #{uid_set.inspect} #{action} [#{flg.to_sym}]"
+          log "imap.uid_store #{ uid_set.inspect } #{ action } [#{ flg.to_sym }]"
           log @imap.uid_store(uid_set, action, [flg.to_sym])
         end
       end
@@ -52,7 +52,7 @@ module Vmail
     def move_to(message_ids, mailbox)
       uid_set = convert_to_message_ids(message_ids)
       decrement_max_seqno(uid_set.size)
-      log "Move #{uid_set.inspect} to #{mailbox}"
+      log "Move #{ uid_set.inspect } to #{ mailbox }"
       if mailbox == 'all'
         log "Archiving messages"
       end
@@ -60,13 +60,13 @@ module Vmail
         mailbox = mailbox_aliases[mailbox]
       end
       create_if_necessary mailbox
-      log "Moving uid_set: #{uid_set.inspect} to #{mailbox}"
+      log "Moving uid_set: #{ uid_set.inspect } to #{ mailbox }"
       spawn_thread_if_tty do
         log @imap.uid_copy(uid_set, mailbox)
         log @imap.uid_store(uid_set, '+FLAGS', [:Deleted])
         reload_mailbox
         clear_cached_message
-        log "Moved uid_set #{uid_set.inspect} to #{mailbox}"
+        log "Moved uid_set #{ uid_set.inspect } to #{ mailbox }"
       end
     rescue
       log $!
@@ -78,10 +78,10 @@ module Vmail
         mailbox = mailbox_aliases[mailbox]
       end
       create_if_necessary mailbox
-      log "Copying #{uid_set.inspect} to #{mailbox}"
+      log "Copying #{ uid_set.inspect } to #{ mailbox }"
       spawn_thread_if_tty do
         log @imap.uid_copy(uid_set, mailbox)
-        log "Copied uid_set #{uid_set.inspect} to #{mailbox}"
+        log "Copied uid_set #{ uid_set.inspect } to #{ mailbox }"
       end
     rescue
       log $!

data/lib/vmail/helpers.rb

@@ -23,7 +23,7 @@ module Vmail
         exponent = max_exp if exponent > max_exp # we need this to avoid overflow for the highest unit
         number  /= 1024 ** exponent
         unit = UNITS[exponent]
-        "#{number}#{unit}"
+        "#{ number }#{ unit }"
       end
     end
 

data/lib/vmail/imap_client.rb

@@ -92,7 +92,7 @@ module Vmail
       if mailbox_aliases[mailbox]
         mailbox = mailbox_aliases[mailbox]
       end
-      log "Selecting mailbox #{mailbox.inspect}"
+      log "Selecting mailbox #{ mailbox.inspect }"
       reconnect_if_necessary(30) do
         log @imap.select(Net::IMAP.encode_utf7(mailbox))
       end
@@ -137,7 +137,7 @@ module Vmail
     def get_mailbox_status
       return
       @status = @imap.status(@mailbox,  ["MESSAGES", "RECENT", "UNSEEN"])
-      log "Mailbox status: #{@status.inspect}"
+      log "Mailbox status: #@status.inspect"
     end
 
     def revive_connection
@@ -170,7 +170,7 @@ module Vmail
         }.uniq
       @mailboxes.delete("INBOX")
       @mailboxes.unshift("INBOX")
-      log "Loaded mailboxes: #{@mailboxes.inspect}"
+      log "Loaded mailboxes: #@mailboxes.inspect"
       @mailboxes = @mailboxes.map {|name| mailbox_aliases.invert[name] || name}
       @mailboxes.join("\n")
     end
@@ -182,13 +182,13 @@ module Vmail
       @default_mailbox_aliases.each do |shortname, fullname_list|
         fullname_list.each do |fullname|
           [ "[Gmail]", "[Google Mail]" ].each do |prefix|
-            if self.mailboxes.include?( "#{prefix}/#{fullname}" )
-              @mailbox_aliases[shortname] =  "#{prefix}/#{fullname}"
+            if self.mailboxes.include?( "#{ prefix }/#{ fullname }" )
+              @mailbox_aliases[shortname] =  "#{ prefix }/#{ fullname }"
             end
           end
         end
       end
-      log "Setting aliases to #{@mailbox_aliases.inspect}"
+      log "Setting aliases to #{ @mailbox_aliases.inspect }"
       @mailbox_aliases
     end
 
@@ -202,14 +202,14 @@ module Vmail
 
     def decrement_max_seqno(num)
       return unless STDIN.tty?
-      log "Decremented max seqno from #{self.max_seqno} to #{self.max_seqno - num}"
+      log "Decremented max seqno from #{ self.max_seqno } to #{ self.max_seqno - num }"
       self.max_seqno -= num
     end
 
     def check_for_new_messages
       log "Checking for new messages"
       if search_query?
-        log "Update aborted because query is search query: #{@query.inspect}"
+        log "Update aborted because query is search query: #{ @query.inspect }"
         return ""
       end
       old_num_messages = @num_messages
@@ -218,18 +218,18 @@ module Vmail
       update_query = @query.dup
       # 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}"
+      update_query[0] = "#{ old_num_messages }:#@num_messages"
       ids = reconnect_if_necessary {
         log "Search #update_query"
         @imap.search(Vmail::Query.args2string(update_query))
       }
-      log "- got seqnos: #{ids.inspect}"
-      log "- getting seqnos > #{self.max_seqno}"
+      log "- got seqnos: #{ ids.inspect }"
+      log "- getting seqnos > #{ self.max_seqno }"
       new_ids = ids.select {|seqno| seqno.to_i > self.max_seqno}
       # reset the max_seqno
       self.max_seqno = ids.max
-      log "- setting max_seqno to #{self.max_seqno}"
-      log "- new uids found: #{new_ids.inspect}"
+      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
@@ -263,10 +263,10 @@ module Vmail
     # gets 100 messages prior to id
     def more_messages
       log "Getting more_messages"
-      log "Old start_index: #{@start_index}"
+      log "Old start_index: #@start_index"
       max = @start_index - 1
       @start_index = [(max + 1 - @limit), 1].max
-      log "New start_index: #{@start_index}"
+      log "New start_index: #@start_index"
       fetch_ids = search_query? ? @ids[@start_index..max] : (@start_index..max).to_a
       log fetch_ids.inspect
       message_ids = fetch_and_cache_headers(fetch_ids)
@@ -287,8 +287,8 @@ module Vmail
     def create_if_necessary(mailbox)
       current_mailboxes = mailboxes.map {|m| mailbox_aliases[m] || m}
       if !current_mailboxes.include?(mailbox)
-        log "Current mailboxes: #{current_mailboxes.inspect}"
-        log "Creating mailbox #{mailbox}"
+        log "Current mailboxes: #{ current_mailboxes.inspect }"
+        log "Creating mailbox #{ mailbox }"
         log @imap.create(mailbox)
         @mailboxes = nil # force reload ...
         list_mailboxes
@@ -297,19 +297,19 @@ module Vmail
 
     def append_to_file(message_ids, file)
       message_ids = message_ids.split(',')
-      log "Append to file uid set #{message_ids.inspect} to file: #{file}"
+      log "Append to file uid set #{ message_ids.inspect } to file: #{ file }"
       message_ids.each do |message_id|
         message = show_message(message_id)
         File.open(file, 'a') {|f| f.puts(divider('=') + "\n" + message + "\n\n")}
         subject = (message[/^subject:(.*)/,1] || '').strip
-        log "Appended message '#{subject}'"
+        log "Appended message '#{ subject }'"
       end
-      "Printed #{message_ids.size} message#{message_ids.size == 1 ? '' : 's'} to #{file.strip}"
+      "Printed #{ message_ids.size } message#{ message_ids.size == 1 ? '' : 's' } to #{ file.strip }"
     end
 
     def new_message_template(subject = nil, append_signature = true)
       #set from field to user-specified value
-      headers = {'from' => "#{@name} <#{@from}>",
+      headers = {'from' => "#@name <#@from>",
         'to' => nil,
         'subject' => subject,
         'cc' => @always_cc,
@@ -327,7 +327,7 @@ module Vmail
         if value.is_a?(Array)
           value = value.join(", ")
         end
-        lines << "#{key.gsub("_", '-')}: #{value}"
+        lines << "#{ key.gsub("_", '-') }: #{ value }"
       end
       lines.join("\n")
     end
@@ -340,7 +340,7 @@ module Vmail
 
     def signature_script
       return unless @signature_script
-      %x{ #{@signature_script.strip} }
+      %x{ #{ @signature_script.strip } }
     end
 
     def forward_template
@@ -349,7 +349,7 @@ module Vmail
       headers = formatter.extract_headers
       subject = headers['subject']
       if subject !~ /Fwd: /
-        subject = "Fwd: #{subject}"
+        subject = "Fwd: #{ subject }"
       end
 
       new_message_template(subject, false) +
@@ -360,11 +360,11 @@ module Vmail
     def format_sent_message(mail)
       formatter = Vmail::MessageFormatter.new(mail)
       message_text = <<-EOF
-Sent Message #{self.format_parts_info(formatter.list_parts)}
+Sent Message #{ self.format_parts_info(formatter.list_parts) }
 
-#{format_headers(formatter.extract_headers)}
+#{ format_headers(formatter.extract_headers) }
 
-#{formatter.plaintext_part}
+#{ formatter.plaintext_part }
 EOF
     end
 
@@ -378,9 +378,9 @@ EOF
       log res.inspect
       log "\n"
       msg = if res.is_a?(Mail::Message)
-        "Message '#{mail.subject}' sent"
+        "Message '#{ mail.subject }' sent"
       else
-        "Failed to deliver message '#{mail.subject}'!"
+        "Failed to deliver message '#{ mail.subject }'!"
       end
       log msg
       msg
@@ -405,7 +405,7 @@ EOF
           headers[key] = value
         end
       end
-      log "Delivering message with headers: #{headers.to_yaml}"
+      log "Delivering message with headers: #{ headers.to_yaml }"
       mail.from = headers['from'] || @username
       mail.to = headers['to'] #.split(/,\s+/)
       mail.cc = headers['cc'] #&& headers['cc'].split(/,\s+/)
@@ -417,10 +417,10 @@ EOF
       # after the headers, and followed by a blank line
       if (attachments_section = raw_body.split(/\n\s*\n/, 2)[0]) =~ /^attach(ment|ments)*:/
         files = attachments_section.split(/\n/).map {|line| line[/[-:]\s*(.*)\s*$/, 1]}.compact
-        log "Attach: #{files.inspect}"
+        log "Attach: #{ files.inspect }"
         files.each do |file|
           if File.directory?(file)
-            Dir.glob("#{file}/*").each {|f| mail.add_file(f) if File.size?(f)}
+            Dir.glob("#{ file }/*").each {|f| mail.add_file(f) if File.size?(f)}
           else
             mail.add_file(file) if File.size?(file)
           end
@@ -441,20 +441,20 @@ EOF
     end
 
     def save_attachments(dir)
-      log "Save_attachments #{dir}"
+      log "Save_attachments #{ dir }"
       if !current_mail
         log "Missing a current message"
       end
       return unless dir && current_mail
       attachments = current_mail.attachments
-      `mkdir -p #{dir}`
+      `mkdir -p #{ dir }`
       saved = attachments.map do |x|
         path = File.join(dir, x.filename)
-        log "Saving #{path}"
+        log "Saving #{ path }"
         File.open(path, 'wb') {|f| f.puts x.decoded}
         path
       end
-      "Saved:\n" + saved.map {|x| "- #{x}"}.join("\n")
+      "Saved:\n" + saved.map {|x| "- #{ x }"}.join("\n")
     end
 
     def open_html_part
@@ -477,7 +477,7 @@ EOF
 
     def window_width=(width)
       @width = width.to_i
-      log "Setting window width to #{width}"
+      log "Setting window width to #{ width }"
     end
 
     def smtp_settings
@@ -528,12 +528,12 @@ EOF
     end
 
     def self.daemon(config)
-      puts "Starting Vmail::ImapClient in dir #{Dir.pwd}"
+      puts "Starting Vmail::ImapClient in dir #{ Dir.pwd }"
       $gmail = self.start(config)
       use_uri = config['drb_uri'] || nil # redundant but explicit
       DRb.start_service(use_uri, $gmail)
       uri = DRb.uri
-      puts "Starting gmail service at #{uri}"
+      puts "Starting gmail service at #{ uri }"
       uri
     end
   end

data/lib/vmail/inbox_poller.rb

@@ -8,12 +8,12 @@ module Vmail
     def start_polling
       n = [`which notify-send`.chomp, `which growlnotify`.chomp].detect {|c| c != ''}
       if n
-        log "Using notify tool: #{n}"
+        log "Using notify tool: #{ n }"
         @notifier = case n
           when /notify-send/
-            Proc.new {|t, m| `#{n} -t 6000000 '#{t}' '#{m}'` }
+            Proc.new {|t, m| `#{ n } -t 6000000 '#{ t }' '#{ m }'` }
           when /growlnotify/
-            Proc.new {|t, m| `#{n} -t '#{t}' -m '#{m}'` }
+            Proc.new {|t, m| `#{ n } -t '#{ t }' -m '#{ m }'` }
           end
       else
         log "No notification tool detected. INBOX polling aborted."
@@ -122,7 +122,7 @@ module Vmail
 
     # doesn't try to access Sequel / sqlite3
     def uncached_headers(id_set)
-      log "Fetching headers for #{id_set.size} messages"
+      log "Fetching headers for #{ id_set.size } messages"
       results = reconnect_if_necessary do
         @imap.fetch(id_set, ["FLAGS", "ENVELOPE", "RFC822.SIZE", "UID"])
       end
@@ -148,7 +148,7 @@ module Vmail
       if string.is_a?(::Net::IMAP::TaggedResponse)
         string = string.raw_data
       end
-      @logger.debug "[INBOX POLLER]: #{string}"
+      @logger.debug "[INBOX POLLER]: #{ string }"
     end
 
 

data/lib/vmail/message_formatter.rb

@@ -15,7 +15,7 @@ module Vmail
           list_parts(part.parts)
         else
           # part.charset could be used
-          "- #{part.content_type} #{part.attachment? ? part.filename : ''}"
+          "- #{ part.content_type } #{ part.attachment? ? part.filename : '' }"
         end
       end
       lines.flatten
@@ -78,7 +78,7 @@ module Vmail
       stdin, stdout, stderr = Open3.popen3(html_tool)
       stdin.puts html
       stdin.close
-      output = "[vmail: html part translated into plaintext by '#{html_tool}']\n\n" + stdout.read
+      output = "[vmail: html part translated into plaintext by '#{ html_tool }']\n\n" + stdout.read
       charset = part.content_type_parameters && part.content_type_parameters['charset']
       if charset && charset != 'UTF-8'
         output.encode!('utf-8', charset, undef: :replace, invalid: :replace)

data/lib/vmail/options.rb

@@ -7,11 +7,11 @@ module Vmail
     attr_accessor :config
     attr_accessor :contacts_file
     def initialize(argv)
-      config_file_locations = ['.vmailrc', "#{ENV['HOME']}/.vmailrc"]
+      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|
+      @contacts_file = [DEFAULT_CONTACTS_FILENAME, "#{ ENV['HOME'] }/#{ DEFAULT_CONTACTS_FILENAME }"].detect  do |path|
         File.exists?(File.expand_path(path))
       end
       @config = {}
@@ -29,7 +29,7 @@ module Vmail
         end
         opts.on("-v", "--version", "Show version") do
           require 'vmail/version'
-          puts "vmail #{Vmail::VERSION}\nCopyright 2010 Daniel Choi under the MIT license"
+          puts "vmail #{ Vmail::VERSION }\nCopyright 2010 Daniel Choi under the MIT license"
           exit
         end
         opts.on("-h", "--help", "Show this message") do
@@ -42,13 +42,13 @@ module Vmail
         begin
           opts.parse!(argv)
           if @config_file && File.exists?(@config_file)
-            STDERR.puts "Using config file: #{@config_file}"
+            STDERR.puts "Using config file: #@config_file"
           else
             STDERR.puts <<EOF
 
 Missing config file!
 
-#{INSTRUCTIONS}
+#{ INSTRUCTIONS }
 EOF
             exit(1)
           end
@@ -58,7 +58,7 @@ EOF
               STDERR.puts "No contacts file found for auto-completion. See help for how to generate it."
               sleep 0.5
             else
-              STDERR.puts "Using contacts file: #{@contacts_file}"
+              STDERR.puts "Using contacts file: #@contacts_file"
             end
           end
 
@@ -67,7 +67,7 @@ EOF
             if @config['password_script'].nil?
               @config['password'] = ask("Enter gmail password (won't be visible & won't be persisted):") {|q| q.echo = false}
             else
-              @config['password'] = %x{ #{@config['password_script'].strip} }.strip
+              @config['password'] = %x{ #@config['password_script'].strip }.strip
             end
           end
 
@@ -83,12 +83,12 @@ EOF
               end
             end
             STDERR.print "\n"
-            puts "Saved file to #{DEFAULT_CONTACTS_FILENAME}"
+            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}`
+            cmd = "sort #{ DEFAULT_CONTACTS_FILENAME } | uniq > vmail-tmp.txt"
+            cmd2 = "mv vmail-tmp.txt #{ DEFAULT_CONTACTS_FILENAME }"
+            `#{ cmd }`
+            `#{ cmd2 }`
             puts "Done"
             exit
           end

data/lib/vmail/query.rb

@@ -20,7 +20,7 @@ module Vmail
 
     def self.args2string(array)
       array.map {|x|
-        x.to_s.split(/\s+/).size > 1 ? "\"#{x}\"" : x.to_s
+        x.to_s.split(/\s+/).size > 1 ? "\"#{ x }\"" : x.to_s
       }.join(' ')
     end
 

data/lib/vmail/reply_templating.rb

@@ -16,11 +16,11 @@ module Vmail
     def reply_headers
       reply_subject = current_message.subject
       if reply_subject !~ /Re: /
-        reply_subject = "Re: #{reply_subject}"
+        reply_subject = "Re: #{ reply_subject }"
       end
       date = DateTime.parse(current_message.date)
       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_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 +
         ( current_message.plaintext.split(/^-+$/,2)[1].strip.gsub(/^(?=>)/, ">").gsub(/^(?!>)/, "> ") )
@@ -53,9 +53,9 @@ module Vmail
            end
       xs = xs.select {|x|
         email = (x[/<([^>]+)>/, 1] || x)
-        email !~ /#{reply_recipient}/ \
+        email !~ /#{ reply_recipient }/ \
           && email !~ /#@username/ \
-          && (@always_cc ? (email !~ /#{@always_cc}/) : true)
+          && (@always_cc ? (email !~ /#@always_cc/) : true)
       }
       if @always_cc
         xs << @always_cc

data/lib/vmail/searching.rb

@@ -2,7 +2,7 @@ module Vmail
   module Searching
     # The main function called by the client to retrieve messages
     def search(query)
-      log "#search: #{query.inspect}"
+      log "#search: #{ query.inspect }"
       @query = Vmail::Query.parse(query)
       # customizable @limit is Deprecated
       @limit = 100
@@ -17,9 +17,9 @@ module Vmail
       else
         # set the target range to the whole set, unless it is too big
         @start_index = [@num_messages - @limit, 0].max
-        @query.unshift "#{@start_index + 1}:#{@num_messages}"
+        @query.unshift "#{ @start_index + 1 }:#@num_messages"
         query_string = Vmail::Query.args2string(@query)
-        log "Query: #{query_string.inspect}"
+        log "Query: #{ query_string.inspect }"
         @ids = reconnect_if_necessary(180) do # timeout of 3 minutes
           @imap.search(query_string)
         end
@@ -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)
@@ -55,7 +55,7 @@ module Vmail
 
     def search_query?
       x = @query[-1] != 'all'
-      #log "Search query? #{x}"
+      #log "Search query? #{ x }"
       x
     end
   end

data/lib/vmail/send_options.rb

@@ -13,7 +13,7 @@ module Vmail
         end
         opts.on("-v", "--version", "Show version (identical to vmail version)") do
           require 'vmail/version'
-          puts "vmail #{Vmail::VERSION}\nCopyright 2010 Daniel Choi under the MIT license"
+          puts "vmail #{ Vmail::VERSION }\nCopyright 2010 Daniel Choi under the MIT license"
           exit
         end
         opts.on("-h", "--help", "Show this message") do
@@ -26,13 +26,13 @@ module Vmail
         begin
           opts.parse!(argv)
           if @config_file && File.exists?(@config_file)
-            puts "Using config file #{@config_file}"
+            puts "Using config file #@config_file"
           else
             puts <<EOF
 
 Missing config file!
 
-#{INSTRUCTIONS}
+#{ INSTRUCTIONS }
 EOF
             exit(1)
           end

data/lib/vmail/showing_headers.rb

@@ -6,7 +6,7 @@ module Vmail
       messages = message_ids.map {|message_id|
         m = Message[message_id]
         if m.nil?
-          raise "Message #{message_id} not found"
+          raise "Message #{ message_id } not found"
         end
         m
       }
@@ -15,7 +15,7 @@ module Vmail
     end
 
     def fetch_and_cache_headers(id_set)
-      log "Fetching headers for #{id_set.size} messages"
+      log "Fetching headers for #{ id_set.size } messages"
       results = reconnect_if_necessary do
         @imap.fetch(id_set, ["FLAGS", "ENVELOPE", "RFC822.SIZE", "UID"])
       end
@@ -49,7 +49,7 @@ module Vmail
         message.update params
 
         unless Vmail::Labeling[message_id: message_id, label_id: @label.label_id]
-          params = {message_id: message.message_id, uid: uid, label_id: @label.label_id}
+          params = { message_id: message.message_id, uid: uid, label_id: @label.label_id }
 
           Labeling.create params
         end
@@ -65,7 +65,7 @@ module Vmail
                       (address_struct.host ?  Mail::Encodings.unquote_and_convert_to(address_struct.host, 'UTF-8'): "")
                     ].join('@')
                   if address_struct.name
-                   "#{Mail::Encodings.unquote_and_convert_to((address_struct.name || ''), 'UTF-8')} <#{email}>"
+                   "#{ Mail::Encodings.unquote_and_convert_to((address_struct.name || ''), 'UTF-8') } <#{ email }>"
                   else
                     email
                   end
@@ -112,7 +112,7 @@ module Vmail
       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

@@ -15,20 +15,20 @@ module Vmail
     def cached_full_message?(message_id)
       m = Message[message_id]
       if m
-        log "- found message #{message_id}"
+        log "- found message #{ message_id }"
         log "- message has plaintext? #{!m.plaintext.nil?}"
       else
-        log "- could not find message #{message_id.inspect}"
+        log "- could not find message #{ message_id.inspect }"
       end
       m && !m.plaintext.nil? && m
     end
 
     def show_message(message_id, raw=false)
       message_id = message_id.strip.gsub('\\', '')
-      log "Show message: #{message_id.inspect}"
+      log "Show message: #{ message_id.inspect }"
       return current_message.rfc822 if raw
       res = retry_if_needed { fetch_and_cache(message_id) }
-      log "Showing message message_id: #{message_id}"
+      log "Showing message message_id: #{ message_id }"
       @cur_message_id = message_id
       res
     end
@@ -39,21 +39,21 @@ module Vmail
         return message.plaintext
       end
       log "- full message cache miss"
-      params = {message_id: message_id, label_id: @label.label_id}
+      params = { message_id: message_id, label_id: @label.label_id }
       labeling = Labeling[params] || Labeling.create(params)
       unless (labeling && labeling.uid)
-        log "- Labeling not found for #{params.inspect}"
+        log "- Labeling not found for #{ params.inspect }"
         # break out early
-        return "\nUnable to get message for #{labeling.values}"
+        return "\nUnable to get message for #{ labeling.values }"
       end
       uid = labeling.uid
 
-      log "- fetching message uid #{uid}"
+      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?
+        raise "Message uid #{ uid } could not be fetched from server" if res.nil?
         res[0]
       end
       seqno = fetch_data.seqno
@@ -75,11 +75,11 @@ module Vmail
         body = body.encode!('us-ascii', 'utf-8', undef: :replace, invalid: :replace)
       end
       message_text = <<-EOF
-#{message_id} #{number_to_human_size message.size} #{message.flags} #{parts_list}
-#{divider '-'}
-#{headers}
+#{ message_id } #{ number_to_human_size message.size } #{ message.flags } #{ parts_list }
+#{ divider '-' }
+#{ headers }
 
-#{body}
+#{ body }
 EOF
       # 2 calls so we can see more fine grained exceptions
       message.update(:rfc822 => rfc822)
@@ -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
@@ -104,7 +104,7 @@ EOF
     def format_parts_info(parts)
       lines = parts #.select {|part| part !~ %r{text/plain}}
       if lines.size > 0
-        "\n#{lines.join("\n")}"
+        "\n#{ lines.join("\n") }"
       end
     end
 

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = '2.9.4'
+  VERSION = '2.9.5'
 end

data/vmail.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://danielchoi.com/software/vmail.html"
   s.summary     = %q{A Vim interface to Gmail}
   s.description = %q{Manage your email with Vim}
+  s.licenses = %w(MIT)
 
   s.rubyforge_project = "vmail"
 
@@ -21,9 +22,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'mail', '>= 2.2.12'
-  s.add_dependency 'highline', '>= 1.6.1'
-  s.add_dependency 'sequel', '>= 3.24.1'
-  s.add_dependency 'sqlite3', '>= 1.3.3'
-  s.add_dependency 'versionomy', '>= 0.4.4'
+  s.add_runtime_dependency 'mail', '~> 2.2', '>= 2.2.12'
+  s.add_runtime_dependency 'highline', '~> 1.6', '>= 1.6.1'
+  s.add_runtime_dependency 'sequel', '~> 3.24', '>= 3.24.1'
+  s.add_runtime_dependency 'sqlite3', '~> 1.3', '>= 1.3.3'
+  s.add_runtime_dependency 'versionomy', '~> 0.4', '>= 0.4.4'
 end

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: vmail
 version: !ruby/object:Gem::Version
-  version: 2.9.4
+  version: 2.9.5
 platform: ruby
 authors:
 - Daniel Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.12
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.2.12
@@ -28,6 +34,9 @@ dependencies:
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.1
@@ -35,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.1
@@ -42,6 +54,9 @@ dependencies:
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.24'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.24.1
@@ -49,6 +64,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.24'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.24.1
@@ -56,6 +74,9 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.3
@@ -63,6 +84,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.3
@@ -70,6 +94,9 @@ dependencies:
   name: versionomy
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
@@ -77,6 +104,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
@@ -141,7 +171,8 @@ files:
 - test/time_format_test.rb
 - vmail.gemspec
 homepage: http://danielchoi.com/software/vmail.html
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []