mournmail 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e35ed64af5fb25eeedad4c3c901b93125baf6b561b8e2384da7a9ed602b367
-  data.tar.gz: 9174888f40a57d0cffe48d13fef7cc0d2892be312d3ff0b95a0df7aef098c726
+  metadata.gz: 9e37a11a19a93dfc9f11a9b9bb98bf3c4c20454668a1d6315627500ec313dc88
+  data.tar.gz: b8d099a3e67cd35761dab9789f5a3af7c13ebb98f152bf1c031d48d88e4ad69a
 SHA512:
-  metadata.gz: f85ebaadd8f97a43e45856347ad0149594ab17db31c04ba66d85db61b336f3c7cd4548c725868a44522d87941297edc5ad5656901440400f834017ed2e650733
-  data.tar.gz: ddff53280fad3432e0bf0da11cf58c57a60586886828fa512b1bf54cba8e57afc8e2687561ae8b289d95fde271b1679f7da4de56e451b4fd6c00ec9787ccd095
+  metadata.gz: 999cb57363f9df4f2bc00eca563b93c61d32c7409e27d628d2ed2c27763af80688886d9b034570ed4291bd92251c5a7c4ae2a8942ea35aa01e7928d365675e8b
+  data.tar.gz: 96c435e264104b3ebbd1b71d5d561f7a7c207a8c1ee05f1b687192e4811b3b2ef1c7f476a8d2c0655ce452f2e577cfaff5a4c79a9fd28e9d9dc5fbe51944ed3a

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/draft_mode.rb

@@ -7,6 +7,7 @@ module Mournmail
     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)
 
     define_syntax :field_name, /^[A-Za-z\-]+: /
     define_syntax :quotation, /^>.*/
@@ -78,7 +79,7 @@ module Mournmail
                         conf[:delivery_method],
                         options)
       bury_buffer(@buffer)
-      background do
+      Mournmail.background do
         begin
           if !attached_messages.empty?
             attached_messages.each do |attached_message|
@@ -181,6 +182,10 @@ module Mournmail
       end
     end
 
+    define_local_command(:insert_signature, doc: "Insert signature.") do
+      @buffer.insert(CONFIG[:signature])
+    end
+
     private
 
     def end_of_header

data/lib/mournmail/summary_mode.rb

@@ -167,7 +167,7 @@ module Mournmail
 
     define_local_command(:summary_toggle_deleted,
                          doc: <<~EOD) do
-        Toggle Deleted.  Type `x` to expunge deleted messages.
+        Toggle Deleted.  Type `X` to expunge deleted messages.
       EOD
       toggle_flag(selected_uid, :Deleted)
     end

data/lib/mournmail/utils.rb

@@ -66,7 +66,9 @@ module Mournmail
   define_variable :current_uid, attr: :accessor
   define_variable :current_mail, attr: :accessor
   define_variable :background_thread, attr: :accessor
+  define_variable :background_thread_mutex, initial_value: Mutex.new
   define_variable :keep_alive_thread, attr: :accessor
+  define_variable :keep_alive_thread_mutex, initial_value: Mutex.new
   define_variable :imap
   define_variable :imap_mutex, initial_value: Mutex.new
   define_variable :mailboxes, initial_value: []
@@ -75,42 +77,52 @@ module Mournmail
   define_variable :groonga_db
 
   def self.background(skip_if_busy: false)
-    if background_thread&.alive?
-      return if skip_if_busy
-    end
-    self.background_thread = Utils.background {
-      begin
-        yield
-      ensure
-        self.background_thread = nil
+    @background_thread_mutex.synchronize do
+      if background_thread&.alive?
+        if skip_if_busy
+          return
+        else
+          raise EditorError, "Another background thread is running"
+        end
       end
-    }
+      self.background_thread = Utils.background {
+        begin
+          yield
+        ensure
+          self.background_thread = nil
+        end
+      }
+    end
   end
 
   def self.start_keep_alive_thread
-    if keep_alive_thread
-      raise EditorError, "Keep alive thread already running"
-    end
-    self.keep_alive_thread = Thread.start {
-      loop do
-        sleep(CONFIG[:mournmail_keep_alive_interval])
-        background(skip_if_busy: true) do
-          begin
-            imap_connect do |imap|
-              imap.noop
+    @keep_alive_thread_mutex.synchronize do
+      if keep_alive_thread
+        raise EditorError, "Keep alive thread already running"
+      end
+      self.keep_alive_thread = Thread.start {
+        loop do
+          sleep(CONFIG[:mournmail_keep_alive_interval])
+          background(skip_if_busy: true) do
+            begin
+              imap_connect do |imap|
+                imap.noop
+              end
+            rescue => e
+              message("Error in IMAP NOOP: #{e.class}: #{e.message}")
             end
-          rescue => e
-            message("Error in IMAP NOOP: #{e.class}: #{e.message}")
           end
         end
-      end
-    }
+      }
+    end
   end
 
   def self.stop_keep_alive_thread
-    if keep_alive_thread
-      keep_alive_thread&.kill
-      self.keep_alive_thread = nil
+    @keep_alive_thread_mutex.synchronize do
+      if keep_alive_thread
+        keep_alive_thread&.kill
+        self.keep_alive_thread = nil
+      end
     end
   end
 
@@ -228,14 +240,22 @@ module Mournmail
         :scope => 'https://mail.google.com/',
         :redirect_uri => 'urn:ietf:wg:oauth:2.0:oob'
       )
-
       auth_uri = auth_client.authorization_uri.to_s
-      Launchy.open(auth_uri)
-
       auth_client.code = foreground! {
-        Window.echo_area.clear_message
-        Window.redisplay
-        read_from_minibuffer("Code: ").chomp
+        begin
+          Launchy.open(auth_uri)
+        rescue Launchy::CommandNotFoundError
+          buffer = show_google_auth_uri(auth_uri)
+        end
+        begin
+          Window.echo_area.clear_message
+          Window.redisplay
+          read_from_minibuffer("Code: ").chomp
+        ensure
+          if buffer
+            kill_buffer(buffer, force: true)
+          end
+        end
       }
       auth_client.fetch_access_token!
       old_umask = File.umask(077)
@@ -249,6 +269,23 @@ module Mournmail
     end
     auth_client.access_token
   end
+
+  def self.show_google_auth_uri(auth_uri)
+    buffer = Buffer.find_or_new("*message*",
+                                undo_limit: 0, read_only: true)
+    buffer.apply_mode(Mournmail::MessageMode)
+    buffer.read_only_edit do
+      buffer.clear
+      buffer.insert(<<~EOF)
+        Open the following URI in your browser and type obtained code:
+
+        #{auth_uri}
+      EOF
+    end
+    window = Mournmail.message_window
+    window.buffer = buffer
+    buffer
+  end
   
   def self.xoauth2_string(user, access_token)
     "user=#{user}\1auth=Bearer #{access_token}\1\1"

data/lib/mournmail/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mournmail
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Shugo Maeda
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textbringer
@@ -125,7 +125,8 @@ dependencies:
 description: A message user agent for Textbringer.
 email:
 - shugo@ruby-lang.org
-executables: []
+executables:
+- mournmail_reindex
 extensions: []
 extra_rdoc_files: []
 files:
@@ -136,6 +137,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/mournmail_reindex
 - lib/mournmail.rb
 - lib/mournmail/commands.rb
 - lib/mournmail/config.rb
@@ -155,7 +157,7 @@ homepage: https://github.com/shugo/mournmail
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -170,8 +172,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A message user agent for Textbringer.
 test_files: []