mournmail 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b758be18cec7a7b8e51d1d1a02cdc8652200800d3c96cd54b471f360e139310
-  data.tar.gz: d201ace873c79702fec68815cda4276f4d78d8dcb60e982b2d24c43efd014778
+  metadata.gz: ebc2414b32ab7005cc39801155dcfe26eb1381026a7750b80c28ae84db63dae0
+  data.tar.gz: 464beaa7109d55c1730baad310ac064974cf902fd43281c936721587edd175fc
 SHA512:
-  metadata.gz: d972e8d6410736c90eb8074f723a96bed957ca7cdd7c74350261c47cce57c3527a692ea422375e08a5f892ee08fbcfcb7d88edbb0b83e9c6ab1adf6f0616383b
-  data.tar.gz: fa3659729fc83d4373896511009080e36297c1382e857e25ef2c7dfa1421d78ef506bafd23d81e00f504972116a0a281843359b22b4446b2031791e6b115450c
+  metadata.gz: 13eebd0a106ac2494793d379ab682091e2dcc6aff0cf5fe6c5c7eebb712c7ba0ddeb0f14d9e16278bebae72ee8a18747024bc64f5c9d42772ea50ec5a649f666
+  data.tar.gz: 1d6a84e080f9612c41201c6fa59856fee33e2a9c0a20159185ceef8e36f8b575ecd98762d77ea19a3de00e760925262e10ad5ec7630920fef9e6edbf4b83b2fb

data/.github/workflows/push_gem.yml

@@ -0,0 +1,48 @@
+name: Publish gem to rubygems.org
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: read
+
+jobs:
+  push:
+    if: github.repository == 'shugo/mournmail'
+    runs-on: ubuntu-latest
+
+    environment:
+      name: rubygems.org
+      url: https://rubygems.org/gems/mournmail
+
+    permissions:
+      contents: write
+      id-token: write
+
+    steps:
+      # Set up
+      - name: Harden Runner
+        uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      # Release
+      - name: Publish to RubyGems
+        uses: rubygems/release-gem@612653d273a73bdae1df8453e090060bb4db5f31 # v1
+
+      - name: Create GitHub release
+        run: |
+          tag_name="$(git describe --tags --abbrev=0)"
+          gh release create "${tag_name}" --verify-tag --draft --generate-notes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/README.md

@@ -70,6 +70,67 @@ Type `M-x mail` to send a mail.
 
 Type `M-x mournmail` to visit INBOX.
 
+## Key bindings
+
+### Summary
+
+|Key |Command |Description |
+|---|---|---|
+|s   |mournmail_summary_sync |Sync summary. With C-u sync all mails |
+|SPC |summary_read_command |Read a mail |
+|C-h |summary_scroll_down_command |Scroll down the current message |
+|n   |summary_next_command |Display the next mail |
+|w   |summary_write_command |Write a new mail |
+|a   |summary_reply_command |Reply to the current message |
+|A   |summary_reply_command |Reply to the current message |
+|f   |summary_forward_command |Forward the current message |
+|u   |summary_toggle_seen_command |Toggle Seen |
+|$   |summary_toggle_flagged_command |Toggle Flagged |
+|d   |summary_toggle_deleted_command |Toggle Deleted |
+|x   |summary_toggle_mark_command |Toggle mark |
+|* a |summary_mark_all_command |Mark all mails |
+|* n |summary_unmark_all_command |Unmark all mails |
+|* r |summary_mark_read_command |Mark read mails |
+|* u |summary_mark_unread_command |Mark unread mails |
+|* s |summary_mark_flagged_command |Mark flagged mails |
+|* t |summary_mark_unflagged_command |Mark unflagged mails |
+|y   |summary_archive_command |Archive mails. Archived mails will be deleted or refiled from the server, and only shown by summary_search_command |
+|o   |summary_refile_command |Refile marked mails |
+|!   |summary_refile_spam_command |Refile marked mails as spam |
+|p   |summary_prefetch_command |Prefetch mails |
+|X   |summary_expunge_command |Expunge deleted mails |
+|v   |summary_view_source_command |View source of a mail |
+|M   |summary_merge_partial_command |Merge marked message/partial |
+|q   |mournmail_quit |Quit Mournmail |
+|k   |previous_line |Move up |
+|j   |next_line |Move down |
+|m   |mournmail_visit_mailbox |Visit mailbox |
+|S   |mournmail_visit_spam_mailbox |Visit spam mailbox |
+|/   |summary_search_command |Search mails |
+|t   |summary_show_thread_command |Show the thread of the current mail |
+|@   |summary_change_account_command |Change the current account |
+
+### Message
+
+|Key |Command |Description |
+|---|---|---|
+|RET |message_open_link_or_part_command |Open link or MIME part |
+|s   |message_save_part_command |Save the MIME part |
+|TAB |message_next_link_or_part_command| Go to the next link or MIME part |
+
+### Draft
+
+|Key |Command |Description |
+|---|---|---|
+|C-c C-c     |draft_send_command |Send a mail |
+|C-c C-k     |draft_kill_command |Kill the draft buffer |
+|C-c C-x TAB |draft_attach_file_command |Attach a file |
+|C-c C-x v   |draft_pgp_sign_command |PGP sign |
+|C-c C-x e   |draft_pgp_encrypt_command |PGP encrypt |
+|C-c TAB     |insert_signature_command |Insert signature |
+|C-c @       |draft_change_account_command |Change account |
+|TAB         |draft_complete_or_insert_tab_command |Complete a mail address or insert a tab |
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/mournmail/config.rb

@@ -9,6 +9,7 @@ module Textbringer
     "From",
     "To",
     "Cc",
+    "Bcc",
     "Reply-To",
     "User-Agent",
     "X-Mailer",
@@ -35,7 +36,7 @@ module Textbringer
     CONFIG[:mournmail_link_open_comamnd] = "xdg-open"
   end
   CONFIG[:mournmail_addresses_path] = File.expand_path("~/.addresses")
-  CONFIG[:mournmail_signature_regexp] = /^\n-- /
+  CONFIG[:mournmail_signature_regexp] = /^-- /
   CONFIG[:mournmail_allowed_attachment_extensions] = [
     "txt",
     "md",
@@ -53,4 +54,15 @@ module Textbringer
     "ppt",
     "zip"
   ]
+  CONFIG[:forgotten_attachment_re] = 
+    Regexp.new(
+      "^(?!>).*" +
+        Regexp.union(
+          /I('ve| have) (attached|included)/,
+          /See the (attached|attachment)/,
+          /Attached file/,
+          /添付(する|した|します|しました|いたします|いたしました)/,
+          /ファイルを参照/
+        ).to_s
+    )
 end

data/lib/mournmail/draft_mode.rb

@@ -21,11 +21,15 @@ module Mournmail
 
     define_local_command(:draft_send,
                          doc: "Send a mail and exit from mail buffer.") do
-      unless y_or_n?("Send this mail?")
-        return
+      s = @buffer.to_s
+      if s.match?(CONFIG[:forgotten_attachment_re]) &&
+          !s.match?(/^Attached-File:/)
+        msg = "It seems like you forgot to attach a file. Send anyway?"
+        return unless yes_or_no?(msg)
+      else
+        return unless y_or_n?("Send this mail?")
       end
       run_hooks(:mournmail_pre_send_hook)
-      s = @buffer.to_s
       charset = CONFIG[:mournmail_charset]
       begin
         s.encode(charset)

data/lib/mournmail/message_mode.rb

@@ -11,10 +11,12 @@ module Mournmail
     MESSAGE_MODE_MAP.define_key("\t", :message_next_link_or_part_command)
 
     # See http://nihongo.jp/support/mail_guide/dev_guide.txt
-    MAILTO_REGEXP = URI.regexp("mailto")
-    URI_REGEXP = /(https?|ftp):\/\/[^ 　\t\n>)"]*[^\] 　\t\n>.,:)"]+|#{MAILTO_REGEXP}/
+    URI_REGEXP = Regexp.union(URI.regexp("http"),
+                              URI.regexp("https"),
+                              URI.regexp("ftp"),
+                              URI.regexp("mailto"))
     MIME_REGEXP = /^\[(([0-9.]+) [A-Za-z._\-]+\/[A-Za-z._\-]+.*|PGP\/MIME .*)\]$/
-    URI_OR_MIME_REGEXP = /#{URI_REGEXP}|#{MIME_REGEXP}/
+    URI_OR_MIME_REGEXP = Regexp.union(URI_REGEXP, MIME_REGEXP)
 
     define_syntax :field_name, /^[A-Za-z\-]+: /
     define_syntax :quotation, /^>.*/
@@ -128,7 +130,7 @@ module Mournmail
       if part.multipart?
         raise EditorError, "Can't open a multipart entity."
       end
-      ext = part_file_name(part).slice(/\.([^.]+)\z/, 1)
+      ext = part_file_name(part).slice(/\.([^.]+)\z/, 1).downcase
       if part.main_type != "text" || part.sub_type == "html"
         if ext.nil?
           raise EditorError, "The extension of the filename is not specified"

data/lib/mournmail/message_rendering.rb

@@ -1,5 +1,5 @@
 require "mail"
-require "html2text"
+require "nokogiri"
 
 module Mournmail
   module MessageRendering
@@ -34,7 +34,9 @@ module Mournmail
         elsif main_type.nil? || main_type == "text"
           s = Mournmail.to_utf8(body.decoded, charset)
           if sub_type == "html"
-            "[0 text/html]\n" + Html2Text.convert(s)
+            doc = Nokogiri::HTML(s)
+            doc.css("script, style, link").each { |node| node.remove }
+            "[0 text/html]\n" + doc.css("body").text.squeeze(" \n")
           else
             s
           end
@@ -115,6 +117,10 @@ module Mournmail
         type = Mail::Encodings.decode_encode(self["content-type"].to_s,
                                              :decode) rescue
           "broken/type; error=\"#{$!} (#{$!.class})\""
+        filename = self["content-disposition"]&.filename
+        if filename && !self["content-type"]&.filename
+          type += "; filename=#{filename}"
+        end
         "[#{index} #{type}]\n" +
           render_content(indices, no_content)
       end

data/lib/mournmail/summary.rb

@@ -142,7 +142,8 @@ module Mournmail
             s = data[0].attr["BODY[]"]
             mail = Mournmail.parse_mail(s)
             spam_mailbox = Mournmail.account_config[:spam_mailbox]
-            if @mailbox != Net::IMAP.encode_utf7(spam_mailbox)
+            if spam_mailbox.nil? || 
+                @mailbox != Net::IMAP.encode_utf7(spam_mailbox)
               item.cache_id = Mournmail.write_mail_cache(s)
               Mournmail.index_mail(item.cache_id, mail)
             end
@@ -261,6 +262,7 @@ module Mournmail
       width = 0
       str = +""
       s.each_char do |c|
+        next if c == "\n"
         w = Buffer.display_width(c)
         width += w
         if width > n

data/lib/mournmail/summary_mode.rb

@@ -478,6 +478,11 @@ module Mournmail
 
     private
 
+    def get_summary_item(uid)
+      summary = Mournmail.current_summary
+      summary && summary[uid]
+    end
+
     def selected_uid
       uid = @buffer.save_excursion {
         @buffer.beginning_of_line
@@ -538,7 +543,7 @@ module Mournmail
     end
         
     def mark_as_seen(uid, update_server)
-      summary_item = Mournmail.current_summary[uid]
+      summary_item = get_summary_item(uid)
       if summary_item && !summary_item.flags.include?(:Seen)
         summary_item.set_flag(:Seen, update_server: update_server)
         Mournmail.current_summary.save
@@ -547,7 +552,7 @@ module Mournmail
     end
 
     def toggle_flag(uid, flag)
-      summary_item = Mournmail.current_summary[uid]
+      summary_item = get_summary_item(uid)
       if summary_item
         Mournmail.background do
           summary_item.toggle_flag(flag)
@@ -596,8 +601,8 @@ module Mournmail
       summary_text = messages.map { |m|
         format("%s [ %s ] %s\n",
                m.date.strftime("%m/%d %H:%M"),
-               ljust(m.from.to_s, 16),
-               ljust(m.subject.to_s, 45))
+               ljust(m.from.to_s.gsub(/\n/, ""), 16),
+               ljust(m.subject.to_s.gsub(/\n/, ""), 45))
       }.join
       buffer = Buffer.find_or_new(buffer_name, undo_limit: 0,
                                   read_only: true)
@@ -657,7 +662,7 @@ module Mournmail
 
     def current_message
       uid = selected_uid
-      item = Mournmail.current_summary[uid]
+      item = get_summary_item(uid)
       message = Groonga["Messages"][item.cache_id]
       if message.nil?
         raise EditorError, "No message found"

data/lib/mournmail/utils.rb

@@ -13,15 +13,28 @@ require 'google/api_client/auth/storages/file_store'
 require 'launchy'
 require "socket"
 
-class Net::SMTP
-  def auth_xoauth2(user, secret)
-    check_auth_args user, secret
-    res = critical {
-      s = Net::IMAP::XOauth2Authenticator.new(user, secret).process("")
-      get_response('AUTH XOAUTH2 ' + base64_encode(s))
-    }
-    check_auth_response res
-    res
+if defined?(Net::SMTP::Authenticator)
+  class Net::SMTP
+    class AuthXOAuth2 < Net::SMTP::Authenticator
+      auth_type :xoauth2
+
+      def auth(user, secret)
+        s = Net::IMAP::XOauth2Authenticator.new(user, secret).process("")
+        finish('AUTH XOAUTH2 ' + base64_encode(s))
+      end
+    end
+  end
+else    
+  class Net::SMTP
+    def auth_xoauth2(user, secret)
+      check_auth_args user, secret
+      res = critical {
+        s = Net::IMAP::XOauth2Authenticator.new(user, secret).process("")
+        get_response('AUTH XOAUTH2 ' + base64_encode(s))
+      }
+      check_auth_response res
+      res
+    end
   end
 end
 
@@ -184,7 +197,7 @@ module Mournmail
         end
         Timeout.timeout(CONFIG[:mournmail_imap_connect_timeout]) do
           @imap = Net::IMAP.new(conf[:imap_host],
-                                conf[:imap_options])
+                                conf[:imap_options].except(:auth_type, :user_name))
           @imap.authenticate(auth_type, conf[:imap_options][:user_name],
                              password)
           @mailboxes = @imap.list("", "*").map { |mbox|

data/lib/mournmail/version.rb

@@ -1,3 +1,3 @@
 module Mournmail
-  VERSION = "1.0.3"
+  VERSION = "1.0.5"
 end

data/mournmail.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rroonga"
   spec.add_runtime_dependency "google-apis-core"
   spec.add_runtime_dependency "launchy"
-  spec.add_runtime_dependency "html2text"
+  spec.add_runtime_dependency "nokogiri"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", ">= 12.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mournmail
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Shugo Maeda
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2024-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textbringer
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: html2text
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -172,6 +172,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/push_gem.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -199,7 +200,7 @@ homepage: https://github.com/shugo/mournmail
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -214,8 +215,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
-signing_key:
+rubygems_version: 3.5.9
+signing_key: 
 specification_version: 4
 summary: A message user agent for Textbringer.
 test_files: []