mournmail 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 624dd4f9dacde981ede7170c87da6c8ddb3a6aae
-  data.tar.gz: 9b1890ed2a07cdd551e4688bb88d7a80b1ff2c51
+SHA256:
+  metadata.gz: 422feadab2e36499c76f69f1836ce4e384497f0e86814cb4c20d0966e70b69b8
+  data.tar.gz: 82423aa120aef42601ef86737e8461b96c32f786d9e7e647c80a4dfdc14a93f1
 SHA512:
-  metadata.gz: ea1353b03b02800c953d1df9c088400ec1d5698953105f9a0b8c55f1b387d61367061e83f873a891bfbcd73c3bf7a6f17e5a0b539d1cbe16b052b104cb88b18e
-  data.tar.gz: 97a308e32677cc6a51490d1be5f4528159760e22866ceef39d33f977ee94fadd3fd95369ab72199baf8d0f5a47cb9daad435b5d0d971e20b2013a82bcc41e2f5
+  metadata.gz: 7a4bba313e307593fad8635b6f284bbc58a79087adad0671849bbf3ec416e554ba7c4af258f4b6556606262897035a08313d5f40754cde56bf8652555049ef09
+  data.tar.gz: 6a30de329d0dc20d86954c1cb8d881bfe15b8309931f2fbba98cdd1a690aa53d6eab1f345b86822c2a6de19905e357232fea1e2092077d866b1f9c4fc2a630d1

data/README.md

@@ -10,34 +10,53 @@ Mournmail is a message user agent for
 ## Configuration
 
 ```ruby
-# The default value of From:
-CONFIG[:mournmail_from] = "Shugo Maeda <shugo@example.com>"
-# The default charset
-CONFIG[:mournmail_charset] = "ISO-2022-JP"
-# The delivery method for Mail#delivery_method
-CONFIG[:mournmail_delivery_method] = :smtp
-# The options for Mail#delivery_method
-CONFIG[:mournmail_delivery_options] = {
-  :address => "smtp.example.com",
-  :port => 465,
-  :domain => Socket.gethostname,
-  :user_name => "shugo",
-  :password => File.read("/path/to/smtp_passwd").chomp,
-  :authentication => "login",
-  :tls => true,
-  :ca_file => "/path/to/cacert.pem"
-}
-# The host for Net::IMAP#new
-CONFIG[:mournmail_imap_host] = "imap.example.com"
-# The options for Net::IMAP.new and
-# Net::IMAP#authenticate (auth_type, user_name, and password)
-CONFIG[:mournmail_imap_options] = {
-  ssl: {
-    :ca_file => File.expand_path("/path/to/cacert.pem")
+CONFIG[:mournmail_accounts] = {
+  "example.com" => {
+    from: "Shugo Maeda <shugo@example.com>",
+    delivery_method: :smtp,
+    delivery_options: {
+      address: "smtp.example.com",
+      port: 465,
+      domain: Socket.gethostname,
+      user_name: "shugo",
+      password: File.read("/path/to/smtp_passwd").chomp,
+      authentication: "login",
+      tls: true,
+      ca_file: "/path/to/ca.pem"
+    },
+    imap_host: "imap.example.com",
+    imap_options: {
+      auth_type: "PLAIN",
+      user_name: "shugo",
+      password: File.read("/path/to/imap_passwd").chomp,
+      ssl: { ca_file: "/path/to/ca.pem" }
+    },
+    spam_mailbox: "spam",
+    outbox_mailbox: "outbox",
+    archive_mailbox_format: "archive/%Y"
+  },
+  "gmail.com" => {
+    from: "Example <example@gmail.com>",
+    delivery_method: :smtp,
+    delivery_options: {
+      address: "smtp.gmail.com",
+      port: 587,
+      domain: Socket.gethostname,
+      user_name: "example@gmail.com",
+      password: File.read("/path/to/gmail_passwd").chomp,
+      authentication: "login",
+      enable_starttls_auto: true
+    },
+    imap_host: "imap.gmail.com",
+    imap_options: {
+      auth_type: "PLAIN",
+      user_name: "example@gmail.com",
+      password: File.read(File.expand_path("~/.textbringer/gmail_passwd")).chomp,
+      ssl: true
+    },
+    spam_mailbox: "迷惑メール",
+    archive_mailbox_format: false
   },
-  auth_type: "PLAIN",
-  user_name: "shugo",
-  password: File.read("/path/to/imap_passwd").chomp
 }
 ```
 

data/lib/mournmail.rb

@@ -9,4 +9,6 @@ require_relative "mournmail/summary"
 require_relative "mournmail/draft_mode"
 require_relative "mournmail/summary_mode"
 require_relative "mournmail/message_mode"
+require_relative "mournmail/search_result_mode"
 require_relative "mournmail/commands"
+require_relative "mournmail/mail_encoded_word_patch"

data/lib/mournmail/commands.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 define_command(:mournmail, doc: "Start mournmail.") do
+  Mournmail.open_groonga_db
   mournmail_visit_mailbox("INBOX")
 end
 
 define_command(:mournmail_visit_mailbox, doc: "Start mournmail.") do
-  |mailbox = read_from_minibuffer("Visit mailbox: ", default: "INBOX")|
+  |mailbox = Mournmail.read_mailbox_name("Visit mailbox: ", default: "INBOX")|
   mournmail_summary_sync(mailbox)
 end
 
@@ -33,10 +34,10 @@ define_command(:mournmail_summary_sync, doc: "Sync summary.") do
       message("Syncing #{mailbox} in background... Done")
       begin
         buffer.beginning_of_buffer
-        buffer.re_search_forward(/^\d+ u/)
+        buffer.re_search_forward(/^ *\d+ u/)
       rescue SearchError
         buffer.end_of_buffer
-        buffer.re_search_backward(/^\d+ /, raise_error: false)
+        buffer.re_search_backward(/^ *\d+ /, raise_error: false)
       end
       summary_read_command
     end
@@ -63,6 +64,7 @@ define_command(:mournmail_quit, doc: "Quit mournmail.") do
   Mournmail.current_summary = nil
   Mournmail.current_mail = nil
   Mournmail.current_uid = nil
+  Mournmail.close_groonga_db
 end
 
 define_command(:mail, doc: "Write a new mail.") do
@@ -70,8 +72,9 @@ define_command(:mail, doc: "Write a new mail.") do
   buffer = Buffer.new_buffer("*draft*")
   switch_to_buffer(buffer)
   draft_mode
+  conf = Mournmail.account_config
   insert <<~EOF
-    From: #{CONFIG[:mournmail_from]}
+    From: #{conf[:from]}
     To: 
     Subject: 
     User-Agent: Mournmail/#{Mournmail::VERSION} Textbringer/#{Textbringer::VERSION} Ruby/#{RUBY_VERSION}

data/lib/mournmail/config.rb

@@ -2,9 +2,7 @@
 
 module Textbringer
   CONFIG[:mournmail_directory] = File.expand_path("~/.mournmail")
-  CONFIG[:mournmail_from] = ""
-  CONFIG[:mournmail_delivery_method] = :smtp
-  CONFIG[:mournmail_delivery_options] = {}
+  CONFIG[:mournmail_accounts] = {}
   CONFIG[:mournmail_charset] = "utf-8"
   CONFIG[:mournmail_save_directory] = "/tmp"
   CONFIG[:mournmail_display_header_fields] = [
@@ -19,8 +17,8 @@ module Textbringer
     "Content-Type"
   ]
   CONFIG[:mournmail_imap_connect_timeout] = 10
+  CONFIG[:mournmail_keep_alive_interval] = 60
   CONFIG[:mournmail_file_open_comamnd] = "xdg-open"
   CONFIG[:mournmail_link_open_comamnd] = "xdg-open"
-  CONFIG[:mournmail_outbox] = nil
   CONFIG[:mournmail_addresses_path] = File.expand_path("~/.addresses")
 end

data/lib/mournmail/draft_mode.rb

@@ -7,6 +7,8 @@ module Mournmail
     MAIL_MODE_MAP.define_key("\C-c\C-k", :draft_kill_command)
     MAIL_MODE_MAP.define_key("\C-c\C-x\C-i", :draft_attach_file_command)
     MAIL_MODE_MAP.define_key("\t", :draft_complete_or_insert_tab_command)
+    MAIL_MODE_MAP.define_key("\C-c\C-xv", :draft_pgp_sign_command)
+    MAIL_MODE_MAP.define_key("\C-c\C-xe", :draft_pgp_encrypt_command)
 
     define_syntax :field_name, /^[A-Za-z\-]+: /
     define_syntax :quotation, /^>.*/
@@ -22,6 +24,7 @@ module Mournmail
       unless y_or_n?("Send this mail?")
         return
       end
+      run_hooks(:mournmail_pre_send_hook)
       s = @buffer.to_s
       charset = CONFIG[:mournmail_charset]
       begin
@@ -30,15 +33,22 @@ module Mournmail
         charset = "utf-8"
       end
       m = Mail.new(charset: charset)
+      m.transport_encoding = "8bit"
       header, body = s.split(/^--text follows this line--\n/, 2)
       attached_files = []
       attached_messages = []
+      pgp_sign = false
+      pgp_encrypt = false
       header.scan(/^([!-9;-~]+):[ \t]*(.*(?:\n[ \t].*)*)\n/) do |name, val|
         case name
         when "Attached-File"
           attached_files.push(val.strip)
         when "Attached-Message"
           attached_messages.push(val.strip)
+        when "PGP-Sign"
+          pgp_sign = val.strip == "yes"
+        when "PGP-Encrypt"
+          pgp_encrypt = val.strip == "yes"
         else
           m[name] = val
         end
@@ -55,32 +65,45 @@ module Mournmail
         end
       end
       attached_files.each do |file|
-        m.add_file(file)
+        m.add_file(filename: File.basename(file),
+                   content: File.read(file),
+                   encoding: "binary")
       end
-      m.delivery_method(CONFIG[:mournmail_delivery_method],
-                        CONFIG[:mournmail_delivery_options])
+      conf = Mournmail.account_config
+      m.delivery_method(@buffer[:mournmail_delivery_method] ||
+                        conf[:delivery_method],
+                        @buffer[:mournmail_delivery_options] ||
+                        conf[:delivery_options])
       bury_buffer(@buffer)
       background do
         begin
           if !attached_messages.empty?
             attached_messages.each do |attached_message|
-              mailbox, uid = attached_message.strip.split("/")
-              s, = Mournmail.read_mail(mailbox, uid.to_i)
+              cache_id = attached_message.strip
+              s = File.read(Mournmail.mail_cache_path(cache_id))
               part = Mail::Part.new(content_type: "message/rfc822", body: s)
               m.body << part
             end
           end
-          m.deliver!
-          Mournmail.imap_connect do |imap|
-            outbox = CONFIG[:mournmail_outbox]
-            if outbox
+          if pgp_sign || pgp_encrypt
+            m.gpg(sign: pgp_sign, encrypt: pgp_encrypt)
+          end
+          m.deliver
+          next_tick do
+            message("Mail sent.")
+          end
+          outbox = Mournmail.account_config[:outbox_mailbox]
+          if outbox
+            Mournmail.imap_connect do |imap|
+              unless imap.list("", outbox)
+                imap.create(outbox)
+              end
               imap.append(outbox, m.to_s, [:Seen])
             end
           end
           next_tick do
             kill_buffer(@buffer, force: true)
             Mournmail.back_to_summary
-            message("Mail sent.")
           end
         rescue Exception
           next_tick do
@@ -101,9 +124,7 @@ module Mournmail
     define_local_command(:draft_attach_file, doc: "Attach a file.") do
       |file_name = read_file_name("Attach file: ")|
       @buffer.save_excursion do
-        @buffer.beginning_of_buffer
-        @buffer.re_search_forward(/^--text follows this line--$/)
-        @buffer.beginning_of_line
+        end_of_header
         @buffer.insert("Attached-File: #{file_name}\n")
       end
     end
@@ -135,5 +156,27 @@ module Mournmail
         @buffer.insert("\t")
       end
     end
+    
+    define_local_command(:draft_pgp_sign, doc: "PGP sign.") do
+      @buffer.save_excursion do
+        end_of_header
+        @buffer.insert("PGP-Sign: yes\n")
+      end
+    end
+    
+    define_local_command(:draft_pgp_encrypt, doc: "PGP encrypt.") do
+      @buffer.save_excursion do
+        end_of_header
+        @buffer.insert("PGP-Encrypt: yes\n")
+      end
+    end
+
+    private
+
+    def end_of_header
+      @buffer.beginning_of_buffer
+      @buffer.re_search_forward(/^--text follows this line--$/)
+      @buffer.beginning_of_line
+    end
   end
 end

data/lib/mournmail/mail_encoded_word_patch.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "mail"
+
+module Mournmail
+  module MailEncodedWordPatch
+    private
+
+    def fold(prepend = 0) # :nodoc:
+      charset = normalized_encoding
+      decoded_string = decoded.to_s
+      if charset != "UTF-8" ||
+          decoded_string.ascii_only? ||
+          !decoded_string.respond_to?(:encoding) ||
+          decoded_string.encoding != Encoding::UTF_8 ||
+          Regexp.new('\p{Han}|\p{Hiragana}|\p{Katakana}') !~ decoded_string
+        # Use Q encoding
+        return super(prepend)
+      end
+      words = decoded_string.split(/[ \t]/)
+      folded_lines   = []
+      b_encoding_extra_size = "=?#{charset}?B??=".bytesize
+      while !words.empty?
+        limit = 78 - prepend
+        line = String.new
+        fold_line = false
+        while !fold_line && !words.empty?
+          word = words.first
+          s = (line.empty? ? "" : " ").dup
+          if word.ascii_only?
+            s << word
+            break if !line.empty? && line.bytesize + s.bytesize > limit
+            words.shift
+            if prepend + line.bytesize + s.bytesize > 998
+              words.unshift(s.slice!(998 - prepend .. -1))
+              fold_line = true
+            end
+          else
+            words.shift
+            encoded_text = base64_encode(word)
+            min_size = line.bytesize + s.bytesize + b_encoding_extra_size
+            new_size = min_size + encoded_text.bytesize
+            if new_size > limit
+              n = ((limit - min_size) * 3.0 / 4.0).floor
+              if n <= 0
+                words.unshift(word) if !line.empty?
+                break
+              end
+              truncated = word.byteslice(0, n).scrub("")
+              rest = word.byteslice(truncated.bytesize,
+                                    word.bytesize - truncated.bytesize)
+              words.unshift(rest)
+              encoded_text = base64_encode(truncated)
+              fold_line = true
+            end
+            encoded_word = "=?#{charset}?B?#{encoded_text}?="
+            s << encoded_word
+          end
+          line << s
+        end
+        folded_lines << line
+        prepend = 1 # Space will be prepended
+      end
+      folded_lines
+    end
+
+    def base64_encode(word)
+      Mail::Encodings::Base64.encode(word).gsub(/[\r\n]/, "")
+    end
+  end
+end
+
+Mail::UnstructuredField.prepend(Mournmail::MailEncodedWordPatch)

data/lib/mournmail/message_mode.rb

@@ -13,7 +13,8 @@ module Mournmail
 
     define_syntax :field_name, /^[A-Za-z\-]+: /
     define_syntax :quotation, /^>.*/
-    define_syntax :mime_part, /^\[([0-9.]+) [A-Za-z._\-]+\/[A-Za-z._\-]+.*\]$/
+    define_syntax :mime_part,
+      /^\[(([0-9.]+) [A-Za-z._\-]+\/[A-Za-z._\-]+.*|PGP\/MIME .*)\]$/
     define_syntax :link, URI_REGEXP
 
     def initialize(buffer)
@@ -53,7 +54,7 @@ module Mournmail
         if @buffer.looking_at?(/\[([0-9.]+) .*\]/)
           index = match_string(1)
           indices = index.split(".").map(&:to_i)
-          Mournmail.current_mail.dig_part(*indices)
+          @buffer[:mournmail_mail].dig_part(*indices)
         else
           nil
         end

data/lib/mournmail/message_rendering.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "mail"
-require "mail-iso-2022-jp"
 
 module Mournmail
   module MessageRendering
@@ -12,7 +11,7 @@ module Mournmail
 
       def render_header
         CONFIG[:mournmail_display_header_fields].map { |name|
-          val = self[name]
+          val = self[name]&.to_s&.gsub(/\t/, " ")
           val ? "#{name}: #{val}\n" : ""
         }.join
       end        
@@ -20,7 +19,13 @@ module Mournmail
       def render_body(indices = [])
         if HAVE_MAIL_GPG && encrypted?
           mail = decrypt(verify: true)
-          return mail.render_body(indices)
+          if mail.signatures.empty?
+            sig = ""
+          else
+            sig = "[PGP/MIME signature]\n" +
+              signature_of(mail)
+          end
+          return "[PGP/MIME encrypted message]\n" + mail.render(indices) + sig
         end
         if multipart?
           parts.each_with_index.map { |part, i|
@@ -28,11 +33,7 @@ module Mournmail
           }.join
         else
           s = body.decoded
-          if /\Autf-8\z/i =~ charset
-            s.force_encoding(Encoding::UTF_8).scrub("?")
-          else
-            s.encode(Encoding::UTF_8, charset, replace: "?")
-          end.gsub(/\r\n/, "\n")
+          Mournmail.to_utf8(s, charset).gsub(/\r\n/, "\n")
         end + pgp_signature
       end
 
@@ -54,15 +55,21 @@ module Mournmail
       def pgp_signature 
         if HAVE_MAIL_GPG && signed?
           verified = verify
-          validity = verified.signature_valid? ? "Good" : "Bad"
-          from = verified.signatures.map { |sig|
-            sig.from rescue sig.fingerprint
-          }.join(", ")
-          "#{validity} signature from #{from}\n"
+          signature_of(verified)
         else
           ""
         end
       end
+
+      def signature_of(m)
+        validity = m.signature_valid? ? "Good" : "Bad"
+        from = m.signatures.map { |sig|
+          sig.from rescue sig.fingerprint
+        }.join(", ")
+        s = "#{validity} signature from #{from}"
+        message(s)
+        s + "\n"
+      end
     end
 
     refine ::Mail::Part do
@@ -75,7 +82,7 @@ module Mournmail
 
       def dig_part(i, *rest_indices)
         if main_type == "message" && sub_type == "rfc822"
-          mail = Mail.new(body.raw_source)
+          mail = Mail.new(body.to_s)
           mail.dig_part(i, *rest_indices)
         else
           part = parts[i]
@@ -97,7 +104,7 @@ module Mournmail
         elsif main_type == "message" && sub_type == "rfc822"
           mail = Mail.new(body.raw_source)
           mail.render(indices)
-        elsif self["content-disposition"]&.disposition_type == "attachment"
+        elsif attachment?
           ""
         else
           if main_type == "text" && sub_type == "plain"