vmail 2.8.1 → 2.8.2

data/README.markdown

@@ -63,8 +63,8 @@ during execution (see below).
 ## Configuration file
 
 To run Vmail, create a yaml file called `.vmailrc` and save it either in
-~/.vmail/defaults/ or in your home directory. If you do the latter,
-Vmail will move the file to ~/.vmail/defaults/ when it starts up.
+~/.vmail/default/ or in your home directory. If you do the latter,
+Vmail will move the file to ~/.vmail/default/ when it starts up.
 
 The `.vmailrc` file should look something like this. Substitute your own values.
 

data/lib/vmail/imap_client.rb

@@ -29,6 +29,8 @@ module Vmail
 
     def initialize(config)
       @username, @password = config['username'], config['password']
+      #load user-specified value for from field
+      @from = config['from'] || config['username']
       @name = config['name']
       @signature = config['signature'] 
       @signature_script = config['signature_script'] 
@@ -241,7 +243,7 @@ module Vmail
         ''
       end
     rescue
-      puts "VMAIL_ERROR: #{[$!.message, $!.backtrace].join("\n")}"
+      puts "VMAIL_ERROR: #{$!.class}\n#{[$!.message, $!.backtrace].join("\n")}"
     end
 
     # gets 100 messages prior to id
@@ -292,7 +294,8 @@ module Vmail
     end
 
     def new_message_template(subject = nil, append_signature = true)
-      headers = {'from' => "#{@name} <#{@username}>",
+      #set from field to user-specified value
+      headers = {'from' => "#{@name} <#{@from}>",
         'to' => nil,
         'subject' => subject,
         'cc' => @always_cc,

data/lib/vmail/inbox_poller.rb

@@ -12,7 +12,7 @@ module Vmail
         log "Using notify tool: #{n}"
         @notifier = case n
           when /notify-send/
-            Proc.new {|t, m| `#{n} '#{t}' '#{m}'` }
+            Proc.new {|t, m| `#{n} -t 6000000 '#{t}' '#{m}'` }
           when /growlnotify/
             Proc.new {|t, m| `#{n} -t '#{t}' -m '#{m}'` }
           end
@@ -37,8 +37,9 @@ module Vmail
       new_ids = check_for_new_messages 
       if !new_ids.empty?
         @ids = @ids + new_ids
-        res = uncached_headers(new_ids).map {|m| m[:sender] }.join(", ")
-        @notifier.call "Vmail: new email", "from #{res}"
+	# 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
       end
     rescue
       log "VMAIL_ERROR: #{[$!.message, $!.backtrace].join("\n")}"

data/lib/vmail/reply_templating.rb

@@ -27,7 +27,8 @@ module Vmail
 
       {
         'references' => current_message.message_id,
-        'from' => "#@name <#@username>", 
+	# set 'from' to user-specified value
+        'from' => "#@name <#@from>", 
         'to' => reply_recipient, 
         'cc' => reply_cc, 
         'bcc' => @always_bcc,

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = '2.8.1'
+  VERSION = '2.8.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmail
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail