vmail 0.6.0 → 0.6.1

data/README.markdown

@@ -245,6 +245,13 @@ split window, etc.) Resume editing. Send by typing `,vs`.
 
 At any point, you can quit the composition window by typing `q` in normal mode.
 
+You can also use `vmailsend` from the command line to send a message that
+you've compmosed with correct headers and saved to a file, like so. 
+
+    vmailsend < my_message.txt
+
+vmailsend uses your `.vmailrc` configuration.
+
 ## Attachments
 
 The current version of vmail can handle attachments to a certain extent.

data/lib/vmail/imap_client.rb

@@ -85,10 +85,12 @@ module Vmail
     end
 
     def prime_connection
+      return if @ids.nil? || @ids.empty?
       reconnect_if_necessary(4) do 
         # this is just to prime the IMAP connection
         # It's necessary for some reason before update and deliver. 
         log "priming connection for delivering"
+        
         res = @imap.fetch(@ids[-1], ["ENVELOPE"])
         if res.nil?
           # just go ahead, just log
@@ -572,8 +574,16 @@ EOF
       prime_connection
       mail = new_mail_from_input(text)
       mail.delivery_method(*smtp_settings)
-      log mail.deliver!
-      "message '#{mail.subject}' sent"
+      res = mail.deliver!
+      log res.inspect
+      log "\n"
+      msg = if res.is_a?(Mail::Message)
+        "message '#{mail.subject}' sent"
+      else
+        "failed to deliver message '#{mail.subject}'"
+      end
+      log msg
+      msg
     end
 
     def new_mail_from_input(text)
@@ -585,8 +595,7 @@ EOF
         key, value = *line.split(/:\s*/, 2)
         headers[key] = value
       end
-      log "headers: #{headers.inspect}"
-      log "delivering: #{headers.inspect}"
+      log "delivering message with headers: #{headers.to_yaml}"
       mail.from = headers['from'] || @username
       mail.to = headers['to'] #.split(/,\s+/)
       mail.cc = headers['cc'] #&& headers['cc'].split(/,\s+/)

data/lib/vmail/send_options.rb

@@ -0,0 +1,54 @@
+require 'vmail/options'
+
+module Vmail
+  class SendOptions < Vmail::Options
+
+    def parse(argv)
+      OptionParser.new do |opts|
+        opts.banner = "Usage:  vmailsend" 
+        opts.separator ""
+        opts.separator "Specific options:"
+        opts.on("-c", "--config path", String, "Path to config file") do |config_file|
+          @config_file = config_file
+        end
+        opts.on("-v", "--version", "Show version (identical to vmail version)") do
+          require 'vmail/version'
+          puts "vmail #{Vmail::VERSION}\nCopyright 2010 Daniel Choi under the MIT license"
+          exit
+        end
+        opts.on("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
+        opts.separator ""
+        opts.separator INSTRUCTIONS
+
+        begin
+          opts.parse!(argv)
+          if @config_file && File.exists?(@config_file)
+            puts "Using config file #{@config_file}"
+          else
+            puts <<EOF
+
+Missing config file! 
+
+#{INSTRUCTIONS}
+EOF
+            exit(1)
+          end
+
+          @config = YAML::load(File.read(@config_file))
+          if @config['password'].nil?
+            @config['password'] = ask("Enter gmail password (won't be visible & won't be persisted):") {|q| q.echo = false}
+          end
+
+        rescue OptionParser::ParseError => e
+          STDERR.puts e.message, "\n", opts
+        end
+
+      end
+    end
+  end
+
+end
+

data/lib/vmail/sender.rb

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

data/lib/vmail/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Daniel Choi
@@ -74,6 +74,7 @@ files:
 - lib/vmail/message_formatter.rb
 - lib/vmail/options.rb
 - lib/vmail/reply_template.rb
+- lib/vmail/send_options.rb
 - lib/vmail/sender.rb
 - lib/vmail/string_ext.rb
 - lib/vmail/version.rb