mournmail 1.0.5 → 3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebc2414b32ab7005cc39801155dcfe26eb1381026a7750b80c28ae84db63dae0
-  data.tar.gz: 464beaa7109d55c1730baad310ac064974cf902fd43281c936721587edd175fc
+  metadata.gz: 410f91625278d6121b3f4f0c2253595b294e66b4a0149ce6af53afaaac8a2747
+  data.tar.gz: 2e052315c79594fc4a7946142efce5ff3f04b288e223c4d569f6b7cee423e95d
 SHA512:
-  metadata.gz: 13eebd0a106ac2494793d379ab682091e2dcc6aff0cf5fe6c5c7eebb712c7ba0ddeb0f14d9e16278bebae72ee8a18747024bc64f5c9d42772ea50ec5a649f666
-  data.tar.gz: 1d6a84e080f9612c41201c6fa59856fee33e2a9c0a20159185ceef8e36f8b575ecd98762d77ea19a3de00e760925262e10ad5ec7630920fef9e6edbf4b83b2fb
+  metadata.gz: d3e8e9a07573cacb0f5de41c5055589040a75a6ef2e9b8315e86744efea7f0c11b74cbed2d4c0e92bf4cee724bad183439d5c61b4a7b6f024eb48afe26005db4
+  data.tar.gz: a51657c1ec942e4dd19f8982bfec92566f77c505b25988dd72dd20d8a1869a73ecbe752b682ca0cdae08c5fc5981b710b9b0e2df49f7e9ebe4b8d701e5b8f5a5

data/.github/workflows/push_gem.yml

@@ -28,17 +28,17 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@v4
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
           ruby-version: ruby
 
       # Release
       - name: Publish to RubyGems
-        uses: rubygems/release-gem@612653d273a73bdae1df8453e090060bb4db5f31 # v1
+        uses: rubygems/release-gem@v1
 
       - name: Create GitHub release
         run: |

data/lib/mournmail/config.rb

@@ -26,17 +26,18 @@ module Textbringer
   CONFIG[:mournmail_keep_alive_interval] = 60
   case RUBY_PLATFORM
   when /mswin|mingw/
-    CONFIG[:mournmail_file_open_comamnd] = "start"
-    CONFIG[:mournmail_link_open_comamnd] = "start"
+    CONFIG[:mournmail_file_open_command] = "start"
+    CONFIG[:mournmail_link_open_command] = "start"
   when /darwin/
-    CONFIG[:mournmail_file_open_comamnd] = "open"
-    CONFIG[:mournmail_link_open_comamnd] = "open"
+    CONFIG[:mournmail_file_open_command] = "open"
+    CONFIG[:mournmail_link_open_command] = "open"
   else
-    CONFIG[:mournmail_file_open_comamnd] = "xdg-open"
-    CONFIG[:mournmail_link_open_comamnd] = "xdg-open"
+    CONFIG[:mournmail_file_open_command] = "xdg-open"
+    CONFIG[:mournmail_link_open_command] = "xdg-open"
   end
   CONFIG[:mournmail_addresses_path] = File.expand_path("~/.addresses")
   CONFIG[:mournmail_signature_regexp] = /^-- /
+  CONFIG[:mournmail_summary_lines] = 7
   CONFIG[:mournmail_allowed_attachment_extensions] = [
     "txt",
     "md",
@@ -54,7 +55,7 @@ module Textbringer
     "ppt",
     "zip"
   ]
-  CONFIG[:forgotten_attachment_re] = 
+  CONFIG[:mournmail_forgotten_attachment_re] = 
     Regexp.new(
       "^(?!>).*" +
         Regexp.union(
@@ -65,4 +66,9 @@ module Textbringer
           /ファイルを参照/
         ).to_s
     )
+  CONFIG[:mournmail_summary_line_limit] = 78
+  CONFIG[:mournmail_summary_from_limit] = 16
+  CONFIG[:mournmail_summary_use_line_cache] = true
+  CONFIG[:mournmail_smtp_open_timeout] = 30
+  CONFIG[:mournmail_smtp_read_timeout] = 60
 end

data/lib/mournmail/draft_mode.rb

@@ -22,7 +22,7 @@ module Mournmail
     define_local_command(:draft_send,
                          doc: "Send a mail and exit from mail buffer.") do
       s = @buffer.to_s
-      if s.match?(CONFIG[:forgotten_attachment_re]) &&
+      if s.match?(CONFIG[:mournmail_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)
@@ -76,16 +76,22 @@ module Mournmail
       account = @buffer[:mournmail_delivery_account] ||
         Mournmail.current_account
       conf = CONFIG[:mournmail_accounts][account]
+      delivery_method = @buffer[:mournmail_delivery_method] ||
+        conf[:delivery_method]
       options = @buffer[:mournmail_delivery_options] ||
         conf[:delivery_options]
+      if delivery_method == :smtp
+        options = {
+          open_timeout: CONFIG[:mournmail_smtp_open_timeout],
+          read_timeout: CONFIG[:mournmail_smtp_read_timeout],
+        }.merge(options)
+      end
       if options[:authentication] == "gmail"
         token = Mournmail.google_access_token(account)
         options = options.merge(authentication: "xoauth2",
                                 password: token)
       end
-      m.delivery_method(@buffer[:mournmail_delivery_method] ||
-                        conf[:delivery_method],
-                        options)
+      m.delivery_method(delivery_method, options)
       bury_buffer(@buffer)
       Mournmail.background do
         begin

data/lib/mournmail/message_mode.rb

@@ -11,10 +11,7 @@ module Mournmail
     MESSAGE_MODE_MAP.define_key("\t", :message_next_link_or_part_command)
 
     # See http://nihongo.jp/support/mail_guide/dev_guide.txt
-    URI_REGEXP = Regexp.union(URI.regexp("http"),
-                              URI.regexp("https"),
-                              URI.regexp("ftp"),
-                              URI.regexp("mailto"))
+    URI_REGEXP = URI::RFC2396_PARSER.make_regexp(["http", "https", "ftp", "mailto"])
     MIME_REGEXP = /^\[(([0-9.]+) [A-Za-z._\-]+\/[A-Za-z._\-]+.*|PGP\/MIME .*)\]$/
     URI_OR_MIME_REGEXP = Regexp.union(URI_REGEXP, MIME_REGEXP)
 
@@ -157,7 +154,7 @@ module Mournmail
         find_file(@attached_file.path)
       else
         background do
-          system(*CONFIG[:mournmail_file_open_comamnd], @attached_file.path,
+          system(*CONFIG[:mournmail_file_open_command], @attached_file.path,
                  out: File::NULL, err: File::NULL)
         end
       end
@@ -179,8 +176,8 @@ module Mournmail
         insert u.to_mailtext.sub(/\n\n\z/, "")
         end_of_buffer
       else
-        system(*CONFIG[:mournmail_link_open_comamnd], uri,
-               out: File::NULL, err: File::NULL)
+        cmd = Mournmail.account_config[:link_open_command] || CONFIG[:mournmail_link_open_command]
+        system(*cmd, uri, out: File::NULL, err: File::NULL)
       end
     end
   end

data/lib/mournmail/message_rendering.rb

@@ -1,5 +1,6 @@
 require "mail"
 require "nokogiri"
+require "html2text"
 
 module Mournmail
   module MessageRendering

data/lib/mournmail/summary.rb

@@ -213,8 +213,12 @@ module Mournmail
       }
     end
     
-    def to_s(limit = 78, from_limit = 16, level = 0)
-      @line ||= format_line(limit, from_limit, level)
+    def to_s(limit = CONFIG[:mournmail_summary_line_limit],
+             from_limit = CONFIG[:mournmail_summary_from_limit],
+             level = 0)
+      if @line.nil? || !CONFIG[:mournmail_summary_use_line_cache]
+        @line = format_line(limit, from_limit, level)
+      end
       return @line if @replies.empty?
       s = @line.dup
       child_level = level + 1
@@ -247,7 +251,9 @@ module Mournmail
     
     private
 
-    def format_line(limit = 78, from_limit = 16, level = 0)
+    def format_line(limit = CONFIG[:mournmail_summary_line_limit],
+                    from_limit = CONFIG[:mournmail_summary_from_limit],
+                    level = 0)
       space = "  " * (level < 8 ? level : 8)
       s = +""
       s << format("%6d %s%s %s[ %s ] ",

data/lib/mournmail/summary_mode.rb

@@ -390,7 +390,7 @@ module Mournmail
       summary = Mournmail.current_summary
       mailbox = Mournmail.current_mailbox
       spam_mailbox = Mournmail.account_config[:spam_mailbox]
-      if mailbox == Net::IMAP.encode_utf7(spam_mailbox)
+      if spam_mailbox && mailbox == Net::IMAP.encode_utf7(spam_mailbox)
         raise EditorError, "Can't prefetch spam"
       end
       target_uids = @buffer.to_s.scan(/^ *\d+/).map { |s|
@@ -599,10 +599,16 @@ module Mournmail
     def show_search_result(messages,
                            query: nil, buffer_name: "*search result*")
       summary_text = messages.map { |m|
-        format("%s [ %s ] %s\n",
-               m.date.strftime("%m/%d %H:%M"),
-               ljust(m.from.to_s.gsub(/\n/, ""), 16),
-               ljust(m.subject.to_s.gsub(/\n/, ""), 45))
+        s = +""
+        s << format("%s [ %s ] ",
+                    m.date.strftime("%m/%d %H:%M"),
+                    ljust(m.from.to_s.gsub(/\n/, ""),
+                          CONFIG[:mournmail_summary_from_limit]))
+        s << ljust(m.subject.to_s.gsub(/\n/, ""),
+                   CONFIG[:mournmail_summary_line_limit] - Buffer.display_width(s))
+        s << "\n"
+        s
+
       }.join
       buffer = Buffer.find_or_new(buffer_name, undo_limit: 0,
                                   read_only: true)

data/lib/mournmail/utils.rb

@@ -129,7 +129,8 @@ module Mournmail
   def self.message_window
     if Window.list.size == 1
       split_window
-      shrink_window(Window.current.lines - 8)
+      n = Window.current.lines - (CONFIG[:mournmail_summary_lines] + 1)
+      shrink_window(n)
     end
     windows = Window.list
     i = (windows.index(Window.current) + 1) % windows.size
@@ -197,7 +198,7 @@ module Mournmail
         end
         Timeout.timeout(CONFIG[:mournmail_imap_connect_timeout]) do
           @imap = Net::IMAP.new(conf[:imap_host],
-                                conf[:imap_options].except(:auth_type, :user_name))
+                                conf[:imap_options].except(:auth_type, :user_name, :password))
           @imap.authenticate(auth_type, conf[:imap_options][:user_name],
                              password)
           @mailboxes = @imap.list("", "*").map { |mbox|
@@ -266,7 +267,12 @@ module Mournmail
     FileUtils.mkdir_p(File.dirname(auth_path))
     store = Google::APIClient::FileStore.new(auth_path)
     storage = Google::APIClient::Storage.new(store)
-    storage.authorize
+    begin
+      storage.authorize
+    rescue Signet::AuthorizationError
+      File.unlink(auth_path)
+      raise
+    end
     if storage.authorization.nil?
       conf = CONFIG[:mournmail_accounts][account]
       path = File.expand_path(conf[:client_secret_path])

data/lib/mournmail/version.rb

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

data/mournmail.gemspec

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mournmail
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: '3'
 platform: ruby
 authors:
 - Shugo Maeda
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textbringer
@@ -136,6 +135,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: html2text
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -200,7 +213,6 @@ homepage: https://github.com/shugo/mournmail
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -215,8 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 4.1.0.dev
 specification_version: 4
 summary: A message user agent for Textbringer.
 test_files: []