vmail 0.7.1 → 0.7.2

data/README.markdown

@@ -2,10 +2,9 @@
 
 vmail is a Vim interface to Gmail. 
 
-Why vmail? Because some people love using Vim 1000 times more than using
-a web browser or a GUI mail program. 
+Why vmail? Because some people are 1000 times more efficient and happy in Vim
+than in any web browser or GUI program. 
 
- 
 ## Prerequisites
 
 * a Gmail account
@@ -165,7 +164,7 @@ To save you keystrokes, vmail provides alternative key mappings for
 * trash/delete: `,#` → `,3`
 * mark spam: `,!` → `,1`
 
-These save you from having to press the SHIFT key in each key sequence.
+These save you from having to press the SHIFT key in each case.
 
 ## Checking for new messages
 

data/bin/vmail_client

@@ -7,8 +7,6 @@ method = ARGV.shift
 if method == 'deliver' || method == 'save_draft'
   text = STDIN.read
   puts server.send(method, text)
-elsif method == 'show_help'
-  puts File.expand_path("../../README.markdown", __FILE__)
 else
   puts server.send(method, *ARGV)
 end

data/lib/vmail/message_formatter.rb

@@ -92,13 +92,15 @@ module Vmail
       end
     end
 
-    # depend on lynx
+    # depend on lynx or whatever is set by the VMAIL_HTML_PART_READER
+    # variable
     def format_html_body(part)
+      html_tool = ENV['VMAIL_HTML_PART_READER'] || 'lynx -stdin -dump'
       html = part.body.decoded.gsub("\r", '')
-      stdin, stdout, stderr = Open3.popen3("lynx -stdin -dump")
+      stdin, stdout, stderr = Open3.popen3(html_tool)
       stdin.puts html
       stdin.close
-      output = 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'
         Iconv.conv('UTF-8//TRANSLIT//IGNORE', charset, output) 

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Daniel Choi