vmail 0.5.9 → 0.6.0

data/bin/vmailsend

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+begin
+  require 'vmail/sender'
+rescue LoadError
+  require 'rubygems'
+  require 'vmail/sender'
+end
+
+Vmail::Sender.send
+

data/lib/vmail/imap_client.rb

@@ -146,8 +146,8 @@ module Vmail
             each {|old_row_data| old_row_data[:row_text] = new_row_data[:row_text]}
         }
       else
-        # put new rows before the current ones
-        @message_list.unshift(*new_message_rows)
+        # put new rows after the current ones
+        @message_list = @message_list.concat new_message_rows
       end
       log "returning #{new_message_rows.size} new rows" 
       return new_message_rows.
@@ -201,7 +201,9 @@ module Vmail
                    (date_formatted || '').col(14),
                    address.col(address_col_width),
                    subject.col(subject_col_width), 
-                   number_to_human_size(size).rcol(6) ].join(' ')
+                   number_to_human_size(size).rcol(6),
+                   "#{seqno}:#{uid}"
+      ].join(' ')
       {:uid => uid, :seqno => seqno, :row_text => row_text}
     rescue 
       log "error extracting header for uid #{uid} seqno #{seqno}: #$!"
@@ -339,10 +341,13 @@ module Vmail
       log "showing message at #{index}" 
       return @current_mail.to_s if raw 
       index = index.to_i
-      return @current_message if index == @current_message_index 
+      if index == @current_message_index 
+        return @current_message 
+      end
       envelope_data = @message_list[index]
+      seqno = envelope_data[:seqno]
       uid = envelope_data[:uid] 
-      log "fetching uid #{uid}"
+      log "showing message seqno: #{seqno} uid #{uid}"
       fetch_data = reconnect_if_necessary do 
         @imap.uid_fetch(uid, ["FLAGS", "RFC822", "RFC822.SIZE"])[0]
       end
@@ -571,14 +576,6 @@ EOF
       "message '#{mail.subject}' sent"
     end
 
-    # TODO
-    def resume_draft
-      # chop off top three lines (this is hackey, fix later)
-      # text = text.split("\n")[3..-1].join("\n")
-      # delete date: field
-      # text = text.sub("^date:\s*$", "")
-    end
-
     def new_mail_from_input(text)
       require 'mail'
       mail = Mail.new

data/lib/vmail/reply_template.rb

@@ -23,11 +23,6 @@ module Vmail
       {'from' => "#@name <#@username>", 'to' => primary_recipient, 'cc' => cc, 'subject' => subject, :body => body}
     end
 
-    # just stick this here
-    def forward_headers
-
-    end
-
     def primary_recipient
       from = @mail.header['from']
       reply_to = @mail.header['reply-to']

data/lib/vmail/sender.rb

@@ -0,0 +1,15 @@
+require 'vmail/imap_client'
+
+module Vmail
+  class Sender
+    extend self
+
+    def send
+      opts = Vmail::Options.new(ARGV)
+      config = opts.config.merge 'logile' => STDERR
+      imap_client = Vmail::ImapClient.new config
+      imap_client.deliver STDIN.read
+    end
+  end
+end
+

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = "0.5.9"
+  VERSION = "0.6.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 9
-  version: 0.5.9
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Daniel Choi
@@ -53,6 +53,7 @@ email:
 executables: 
 - vmail
 - vmail_client
+- vmailsend
 extensions: []
 
 extra_rdoc_files: []
@@ -65,6 +66,7 @@ files:
 - Rakefile
 - bin/vmail
 - bin/vmail_client
+- bin/vmailsend
 - lib/vmail.rb
 - lib/vmail.vim
 - lib/vmail/contacts_extractor.rb
@@ -72,6 +74,7 @@ files:
 - lib/vmail/message_formatter.rb
 - lib/vmail/options.rb
 - lib/vmail/reply_template.rb
+- lib/vmail/sender.rb
 - lib/vmail/string_ext.rb
 - lib/vmail/version.rb
 - test/base64_test.rb