mournmail 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 624dd4f9dacde981ede7170c87da6c8ddb3a6aae
-  data.tar.gz: 9b1890ed2a07cdd551e4688bb88d7a80b1ff2c51
+SHA256:
+  metadata.gz: 8cbf82ccf54ab48f7596d24aaacb4673ca8f8271f304264df7aa96a932dac2fb
+  data.tar.gz: facbe695e21c68a1b5c50a9bb9d50894f948e09bab2a436b2174656953b809bf
 SHA512:
-  metadata.gz: ea1353b03b02800c953d1df9c088400ec1d5698953105f9a0b8c55f1b387d61367061e83f873a891bfbcd73c3bf7a6f17e5a0b539d1cbe16b052b104cb88b18e
-  data.tar.gz: 97a308e32677cc6a51490d1be5f4528159760e22866ceef39d33f977ee94fadd3fd95369ab72199baf8d0f5a47cb9daad435b5d0d971e20b2013a82bcc41e2f5
+  metadata.gz: 49c6ba544f435ea5eb150b510e26d18ab0bcd0fddd1a1a147dc0aee84bde05656bb153f44628ee0828b2e02c8f6ccc27b75c7e61b34ca0511c0eb2f074240e1e
+  data.tar.gz: 43accf4207ec48914c79940d2c45ce931beab826759b3e64174257891bf70d741913800aa976b41c19a2b47d1a0c8e32a00215995889058fdee5c82b4bc6e5e0

data/README.md

@@ -10,34 +10,57 @@ 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",
+    signature: <<~EOF
+      -- 
+      Shugo Maeda <shugo@example.com>
+    EOF
+  },
+  "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: "[Gmail]/迷惑メール",
+    archive_mailbox_format: false
   },
-  auth_type: "PLAIN",
-  user_name: "shugo",
-  password: File.read("/path/to/imap_passwd").chomp
 }
 ```
 

data/exe/mournmail_reindex

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require "groonga"
+
+if ARGV.size < 1
+  STDERR.puts "Usage: mournmail_reindex <path to messages.db>"
+  exit 1
+end
+
+Groonga::Database.open(ARGV[0])
+Groonga["Messages"].columns.each do |c|
+  print "Reindexing #{c.name}... "
+  STDOUT.flush
+  c.reindex
+  puts "done"
+end

data/lib/mournmail.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require_relative "mournmail/version"
 require_relative "mournmail/config"
 require_relative "mournmail/faces"
@@ -9,4 +7,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,12 +1,22 @@
-# 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")|
-  mournmail_summary_sync(mailbox)
+define_command(:mournmail_visit_mailbox, doc: "Visit mailbox") do
+  |mailbox = Mournmail.read_mailbox_name("Visit mailbox: ", default: "INBOX")|
+  summary = Mournmail::Summary.load_or_new(mailbox)
+  foreground do
+    Mournmail.show_summary(summary)
+  end
+end
+
+define_command(:mournmail_visit_spam_mailbox, doc: "Visit spam mailbox") do
+  mailbox = Mournmail.account_config[:spam_mailbox]
+  if mailbox.nil?
+    raise EditorError, "spam_mailbox is not specified"
+  end
+  mournmail_visit_mailbox(Net::IMAP.encode_utf7(mailbox))
 end
 
 define_command(:mournmail_summary_sync, doc: "Sync summary.") do
@@ -15,30 +25,10 @@ define_command(:mournmail_summary_sync, doc: "Sync summary.") do
   message("Syncing #{mailbox} in background...")
   Mournmail.background do
     summary = Mournmail.fetch_summary(mailbox, all: all)
-    summary_text = summary.to_s
     summary.save
-    next_tick do
-      buffer = Buffer.find_or_new("*summary*", undo_limit: 0,
-                                  read_only: true)
-      buffer.apply_mode(Mournmail::SummaryMode)
-      buffer.read_only_edit do
-        buffer.clear
-        buffer.insert(summary_text)
-      end
-      switch_to_buffer(buffer)
-      Mournmail.current_mailbox = mailbox
-      Mournmail.current_summary = summary
-      Mournmail.current_mail = nil
-      Mournmail.current_uid = nil
+    foreground do
+      Mournmail.show_summary(summary)
       message("Syncing #{mailbox} in background... Done")
-      begin
-        buffer.beginning_of_buffer
-        buffer.re_search_forward(/^\d+ u/)
-      rescue SearchError
-        buffer.end_of_buffer
-        buffer.re_search_backward(/^\d+ /, raise_error: false)
-      end
-      summary_read_command
     end
   end
 end
@@ -63,6 +53,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,16 +61,18 @@ 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}
     --text follows this line--
   EOF
-  re_search_backward(/^To:/)
-  end_of_line
+  beginning_of_buffer
+  re_search_forward(/^To: */)
   if run_hooks
+    Mournmail.insert_signature
     run_hooks(:mournmail_draft_setup_hook)
   end
 end

data/lib/mournmail/config.rb

@@ -1,10 +1,6 @@
-# frozen_string_literal: true
-
 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] = [
@@ -18,9 +14,26 @@ module Textbringer
     "X-Mailer",
     "Content-Type"
   ]
+  CONFIG[:mournmail_quote_header_fields] = [
+    "Subject",
+    "Date",
+    "From",
+    "To",
+    "Cc"
+  ]
   CONFIG[:mournmail_imap_connect_timeout] = 10
-  CONFIG[:mournmail_file_open_comamnd] = "xdg-open"
-  CONFIG[:mournmail_link_open_comamnd] = "xdg-open"
-  CONFIG[:mournmail_outbox] = nil
+  CONFIG[:mournmail_keep_alive_interval] = 60
+  case RUBY_PLATFORM
+  when /mswin|mingw/
+    CONFIG[:mournmail_file_open_comamnd] = "start"
+    CONFIG[:mournmail_link_open_comamnd] = "start"
+  when /darwin/
+    CONFIG[:mournmail_file_open_comamnd] = "open"
+    CONFIG[:mournmail_link_open_comamnd] = "open"
+  else
+    CONFIG[:mournmail_file_open_comamnd] = "xdg-open"
+    CONFIG[:mournmail_link_open_comamnd] = "xdg-open"
+  end
   CONFIG[:mournmail_addresses_path] = File.expand_path("~/.addresses")
+  CONFIG[:mournmail_signature_regexp] = /^\n-- /
 end

data/lib/mournmail/draft_mode.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Mournmail
   class DraftMode < Textbringer::Mode
     MAIL_MODE_MAP = Keymap.new
@@ -7,6 +5,10 @@ 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)
+    MAIL_MODE_MAP.define_key("\C-c\t", :insert_signature_command)
+    MAIL_MODE_MAP.define_key("\C-c@", :draft_change_account_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,35 +65,58 @@ 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
+      account = @buffer[:mournmail_delivery_account] ||
+        Mournmail.current_account
+      conf = CONFIG[:mournmail_accounts][account]
+      options = @buffer[:mournmail_delivery_options] ||
+        conf[:delivery_options]
+      if options[:authentication] == "gmail"
+        token = Mournmail.google_access_token(account)
+        options = options.merge(authentication: "xoauth2",
+                                password: token)
       end
-      m.delivery_method(CONFIG[:mournmail_delivery_method],
-                        CONFIG[:mournmail_delivery_options])
+      m.delivery_method(@buffer[:mournmail_delivery_method] ||
+                        conf[:delivery_method],
+                        options)
       bury_buffer(@buffer)
-      background do
+      Mournmail.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
+          foreground do
+            message("Mail sent.")
+          end
+          cache_id = Mournmail.write_mail_cache(m.encoded)
+          Mournmail.index_mail(cache_id, m)
+          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
+          foreground do
             kill_buffer(@buffer, force: true)
             Mournmail.back_to_summary
-            message("Mail sent.")
           end
         rescue Exception
-          next_tick do
+          foreground do
             switch_to_buffer(@buffer)
           end
           raise
@@ -101,9 +134,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
@@ -120,10 +151,15 @@ module Mournmail
         start_pos = @buffer.point
         s = @buffer.substring(start_pos, end_pos)
         if !s.empty?
-          re = /^(.*")?#{Regexp.quote(s)}.*/
-          line = File.read(CONFIG[:mournmail_addresses_path]).slice(re)
-          if line
-            addr = line.slice(/^\S+/)
+          re = /^(?:.*")?#{Regexp.quote(s)}.*/
+          addrs = File.read(CONFIG[:mournmail_addresses_path])
+            .scan(re).map { |line| line.slice(/^\S+/) }
+          if !addrs.empty?
+            addr = addrs.inject { |x, y|
+              x.chars.zip(y.chars).take_while { |i, j|
+                i == j
+              }.map { |i,| i }.join
+            }
             @buffer.delete_region(start_pos, end_pos)
             @buffer.insert(addr)
           else
@@ -135,5 +171,48 @@ 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
+
+    define_local_command(:insert_signature, doc: "Insert signature.") do
+      @buffer.insert(CONFIG[:signature])
+    end
+
+    define_local_command(:draft_change_account, doc: "Change account.") do
+      |account = Mournmail.read_account_name("Change account: ")|
+      from = CONFIG[:mournmail_accounts][account][:from]
+      @buffer[:mournmail_delivery_account] = account
+      @buffer.save_excursion do
+        @buffer.beginning_of_buffer
+        @buffer.re_search_forward(/^From:.*/)
+        @buffer.replace_match("From: " + from)
+        @buffer.end_of_buffer
+        if @buffer.re_search_backward(CONFIG[:mournmail_signature_regexp],
+                                      raise_error: false)
+          @buffer.delete_region(@buffer.point, @buffer.point_max)
+        end
+        Mournmail.insert_signature
+      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