mournmail 2 → 3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0470feee9eea6f5ba0071596fe11f01dace923c44ce6c1b33738d4afc7712e07
-  data.tar.gz: 242f831af33c0b3fb3eec8958ecb6db122d055f263452f7c4a9a3c5964db000c
+  metadata.gz: 410f91625278d6121b3f4f0c2253595b294e66b4a0149ce6af53afaaac8a2747
+  data.tar.gz: 2e052315c79594fc4a7946142efce5ff3f04b288e223c4d569f6b7cee423e95d
 SHA512:
-  metadata.gz: aaf1a5eec30365b900c65a6d927bbcb5ae340be299190a48acb3107bc3f325e52e52b2045cea6079a315553f631fd97be4e3c1f888ff25a0ca7924975d9320df
-  data.tar.gz: 3e99259ee5ac139ca90fb047cab4d0121ddfcbbebb3a007ff30544da2595046178915ca54cb82a9ef458fd71ed8b4df99267ce05ea8028af15180e716e4a83e1
+  metadata.gz: d3e8e9a07573cacb0f5de41c5055589040a75a6ef2e9b8315e86744efea7f0c11b74cbed2d4c0e92bf4cee724bad183439d5c61b4a7b6f024eb48afe26005db4
+  data.tar.gz: a51657c1ec942e4dd19f8982bfec92566f77c505b25988dd72dd20d8a1869a73ecbe752b682ca0cdae08c5fc5981b710b9b0e2df49f7e9ebe4b8d701e5b8f5a5

data/lib/mournmail/config.rb

@@ -26,14 +26,14 @@ 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] = /^-- /
@@ -69,4 +69,6 @@ module Textbringer
   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

@@ -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/utils.rb

@@ -267,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 = "2"
+  VERSION = "3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mournmail
 version: !ruby/object:Gem::Version
-  version: '2'
+  version: '3'
 platform: ruby
 authors:
 - Shugo Maeda
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.1.0.dev
 specification_version: 4
 summary: A message user agent for Textbringer.
 test_files: []