vmail 2.7.6 → 2.7.7

data/README.markdown

@@ -15,7 +15,7 @@ than in any web browser or GUI program.
 * a relatively recent version of Vim (Vmail is developed against Vim 7.3)
 * Ruby 1.9.0 or higher with SSL support compiled in (Vmail is developed using Ruby 1.9.2)
 * `libsqlite3-dev` and `sqlite3` (try installing with `apt-get`, `brew`, `yum`, `emerge`, etc.)
-* the `lynx` text-only-mode web browser is required to view HTML mail parts in Vmail
+* text-only-mode web browser (w3m, elinks, or lynx) should be available to view HTML mail parts in Vmail
 
 To install Ruby 1.9.2, I recommend using the [RVM Version Manager][rvm].
 

data/lib/vmail.rb

@@ -32,7 +32,7 @@ module Vmail
                              end
 
     puts "Setting VMAIL_BROWSER to '#{ENV['VMAIL_BROWSER']}'"
-    check_lynx
+    check_html_reader
 
     working_dir = ENV['VMAIL_HOME'] || "#{ENV['HOME']}/.vmail/default"
     `mkdir -p #{working_dir}`
@@ -70,7 +70,7 @@ module Vmail
       puts "INBOX polling disabled."
     end
 
-    puts "WORKING DIR: #{Dir.pwd}"
+    puts "Working directory: #{Dir.pwd}"
 
     # require after the working dir is set
     require 'vmail/imap_client'
@@ -126,11 +126,15 @@ module Vmail
 
   private
 
-  def check_lynx
+  def check_html_reader
     # TODO check for elinks, or firefox (how do we parse VMAIL_HTML_PART_REDAER to determine?)
-    if `which lynx` == ''
-      STDERR.puts "You need to install lynx on your system in order to see html-only messages"
-      sleep 3
+    html_reader = %w( w3m elinks lynx ).detect {|x| `which #{x}` != ''}
+    if html_reader
+      cmd = ['w3m -dump -T text/html', '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
 

data/lib/vmail/message_formatter.rb

@@ -70,10 +70,10 @@ module Vmail
       part.body.decoded.gsub("\r", '')
     end
 
-    # depend on lynx or whatever is set by the VMAIL_HTML_PART_READER
+    # depend on VMAIL_HTML_PART_READER
     # variable
     def format_html_body(part)
-      html_tool = ENV['VMAIL_HTML_PART_READER'] || 'lynx -stdin -dump'
+      html_tool = ENV['VMAIL_HTML_PART_READER'] 
       html = part.body.decoded.gsub("\r", '')
       stdin, stdout, stderr = Open3.popen3(html_tool)
       stdin.puts html

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = '2.7.6'
+  VERSION = '2.7.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmail
 version: !ruby/object:Gem::Version
-  version: 2.7.6
+  version: 2.7.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail