vmail 1.5.4 → 1.5.5

data/Rakefile

@@ -5,6 +5,25 @@ Bundler::GemHelper.install_tasks
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib')
 
+desc "release and build and push new website"
+task :push => [:release, :web]
+
+desc "Bumps version number up one and git commits"
+task :bump do
+  basefile = "lib/vmail/version.rb"
+  file = File.read(basefile)
+  oldver = file[/VERSION = '(\d.\d.\d)'/, 1]
+  newver_i = oldver.gsub(".", '').to_i + 1
+  newver = ("%.3d" % newver_i).split(//).join('.')
+  puts oldver
+  puts newver
+  puts "Bumping version: #{oldver} => #{newver}"
+  newfile = file.gsub("VERSION = '#{oldver}'", "VERSION = '#{newver}'") 
+  File.open(basefile, 'w') {|f| f.write newfile}
+  `git commit -am 'Bump'`
+end
+
+
 desc "build and push website"
 task :web do
   require 'vmail/version'

data/lib/vmail.vim

@@ -634,8 +634,8 @@ function! s:send_message()
   if match(res, '^Failed') == -1
     call s:close_and_focus_list_window()
   endif
-  redraw
   echom substitute(res, '[\s\r\n]\+$', '', '')
+  redraw
 endfunction
 
 " -------------------------------------------------------------------------------- 

data/lib/vmail/imap_client.rb

@@ -20,6 +20,7 @@ module Vmail
       @username, @password = config['username'], config['password']
       @name = config['name']
       @signature = config['signature']
+      @always_cc = config['always_cc']
       @mailbox = nil
       @logger = Logger.new(config['logfile'] || STDERR)
       @logger.level = Logger::DEBUG
@@ -612,7 +613,8 @@ EOF
     def new_message_template(subject = nil, append_signature = true)
       headers = {'from' => "#{@name} <#{@username}>",
         'to' => nil,
-        'subject' => subject
+        'subject' => subject,
+        'cc' => @always_cc 
       }
       format_headers(headers) + (append_signature ? ("\n\n" + signature) : "\n\n")
     end
@@ -635,7 +637,7 @@ EOF
         return nil
       end
       # user reply_template class
-      reply_headers = Vmail::ReplyTemplate.new(@current_mail, @username, @name, replyall).reply_headers
+      reply_headers = Vmail::ReplyTemplate.new(@current_mail, @username, @name, replyall, @always_cc).reply_headers
       body = reply_headers.delete(:body)
       format_headers(reply_headers) + "\n\n\n" + body + signature
     end

data/lib/vmail/reply_template.rb

@@ -5,8 +5,8 @@ require 'time'
 module Vmail
   class ReplyTemplate
 
-    def initialize(mail, username, name, replyall)
-      @username, @name, @replyall = username, name, replyall
+    def initialize(mail, username, name, replyall, always_cc=nil)
+      @username, @name, @replyall, @always_cc = username, name, replyall, always_cc
       @mail = Mail.new(mail)
     end
 
@@ -34,15 +34,15 @@ module Vmail
     end
 
     def cc
-      return nil unless @replyall
+      return nil unless (@replyall || @always_cc)
       cc = @mail.header['to'].value.split(/,\s*/) 
       if @mail.header['cc']
         cc += @mail.header['cc'].value.split(/,\s*/) 
       end
       cc = cc.flatten.compact.
-        select {|x| 
-          x.to_s[/<([^>]+)>/, 1] !~ /#{@username}/ && x.to_s[/^[^<]+/, 1] !~ /#{@name}/
-          }.join(', ')
+        select {|x| x.to_s[/<([^>]+)>/, 1] !~ /#{@username}/ && x.to_s[/^[^<]+/, 1] !~ /#{@name}/ }
+      cc << @always_cc
+      cc.join(', ')
     end
 
     def sender

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "1.5.4"
+  VERSION = '1.5.5'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 4
-  version: 1.5.4
+  - 5
+  version: 1.5.5
 platform: ruby
 authors: 
 - Daniel Choi