sup 0.22.1 → 1.1

data/lib/sup/util.rb

@@ -4,13 +4,15 @@ require 'thread'
 require 'lockfile'
 require 'mime/types'
 require 'pathname'
+require 'rmail'
 require 'set'
 require 'enumerator'
 require 'benchmark'
 require 'unicode'
+require 'unicode/display_width'
 require 'fileutils'
 
-class Lockfile
+module ExtendedLockfile
   def gen_lock_id
     Hash[
          'host' => "#{ Socket.gethostname }",
@@ -36,6 +38,7 @@ class Lockfile
 
   def touch_yourself; touch path end
 end
+Lockfile.send :prepend, ExtendedLockfile
 
 class File
   # platform safe file.link which attempts a copy if hard-linking fails
@@ -105,7 +108,7 @@ module RMail
     end
   end
 
-  class Serialize
+  module CustomizedSerialize
     ## Don't add MIME-Version headers on serialization. Sup sometimes want's to serialize
     ## message parts where these headers are not needed and messing with the message on
     ## serialization breaks gpg signatures. The commented section shows the original RMail
@@ -117,48 +120,7 @@ module RMail
       # end
     end
   end
-
-  class Header
-
-    # Convert to ASCII before trying to match with regexp
-    class Field
-
-      class << self
-        def parse(field)
-          field = field.dup.to_s
-          field = field.fix_encoding!.ascii
-          if field =~ EXTRACT_FIELD_NAME_RE
-            [ $1, $'.chomp ]
-          else
-            [ "", Field.value_strip(field) ]
-          end
-        end
-      end
-    end
-
-    ## Be more cautious about invalid content-type headers
-    ## the original RMail code calls
-    ## value.strip.split(/\s*;\s*/)[0].downcase
-    ## without checking if split returned an element
-
-    # This returns the full content type of this message converted to
-    # lower case.
-    #
-    # If there is no content type header, returns the passed block is
-    # executed and its return value is returned.  If no block is passed,
-    # the value of the +default+ argument is returned.
-    def content_type(default = nil)
-      if value = self['content-type'] and ct = value.strip.split(/\s*;\s*/)[0]
-        return ct.downcase
-      else
-        if block_given?
-          yield
-        else
-          default
-        end
-      end
-    end
-  end
+  Serialize.send :prepend, CustomizedSerialize
 end
 
 class Module
@@ -239,21 +201,14 @@ end
 
 class String
   def display_length
-    @display_length ||= Unicode.width(self.fix_encoding!, false)
-
-    # if Unicode.width fails and returns -1, fall back to
-    # regular String#length, see pull-request: #256.
-    if @display_length < 0
-      @display_length = self.length
-    end
-
-    @display_length
+    @display_length ||= Unicode::DisplayWidth.of(self)
   end
 
   def slice_by_display_length len
     each_char.each_with_object "" do |c, buffer|
-      len -= c.display_length
-      buffer << c if len >= 0
+      len -= Unicode::DisplayWidth.of(c)
+      return buffer if len < 0
+      buffer << c
     end
   end
 
@@ -341,13 +296,14 @@ class String
     ret = []
     s = self
     while s.display_length > len
-      cut = s.slice_by_display_length(len).rindex(/\s/)
+      slice = s.slice_by_display_length(len)
+      cut = slice.rindex(/\s/)
       if cut
         ret << s[0 ... cut]
         s = s[(cut + 1) .. -1]
       else
-        ret << s.slice_by_display_length(len)
-        s = s[ret.last.length .. -1]
+        ret << slice
+        s = s[slice.length .. -1]
       end
     end
     ret << s
@@ -397,8 +353,23 @@ class String
     self
   end
 
+  ## Decodes UTF-7 and returns the resulting decoded string as UTF-8.
+  ##
+  ## Ruby doesn't supply a UTF-7 encoding natively. There is
+  ## Net::IMAP::decode_utf7 which only handles the IMAP "modified UTF-7"
+  ## encoding. This implementation is inspired by that one but handles
+  ## standard UTF-7 shift characters and not the IMAP-specific variation.
+  def decode_utf7
+    gsub(/\+([^-]+)?-/) {
+      if $1
+        ($1 + "===").unpack("m")[0].encode(Encoding::UTF_8, Encoding::UTF_16BE)
+      else
+        "+"
+      end
+    }
+  end
+
   def normalize_whitespace
-    fix_encoding!
     gsub(/\t/, "    ").gsub(/\r/, "")
   end
 
@@ -410,7 +381,7 @@ class String
 
   unless method_defined? :each
     def each &b
-      each_line &b
+      each_line(&b)
     end
   end
 
@@ -460,18 +431,18 @@ class Numeric
 
   def to_human_size
     if self < 1024
-      to_s + "b"
+      to_s + "B"
     elsif self < (1024 * 1024)
-      (self / 1024).to_s + "k"
+      (self / 1024).to_s + "KiB"
     elsif self < (1024 * 1024 * 1024)
-      (self / 1024 / 1024).to_s + "m"
+      (self / 1024 / 1024).to_s + "MiB"
     else
-      (self / 1024 / 1024 / 1024).to_s + "g"
+      (self / 1024 / 1024 / 1024).to_s + "GiB"
     end
   end
 end
 
-class Fixnum
+class Integer
   def to_character
     if self < 128 && self >= 0
       chr
@@ -512,7 +483,9 @@ module Enumerable
     ret
   end
 
-  def sum; inject(0) { |x, y| x + y }; end
+  if not method_defined? :sum
+    def sum; inject(0) { |x, y| x + y }; end
+  end
 
   def map_to_hash
     ret = {}
@@ -568,7 +541,9 @@ class Array
     inject([]) { |a, e| a + e }
   end
 
-  def to_h; Hash[*flatten]; end
+  if not method_defined? :to_h
+    def to_h; Hash[*flatten_one_level]; end
+  end
   def rest; self[1..-1]; end
 
   def to_boolean_h; Hash[*map { |x| [x, true] }.flatten]; end

data/lib/sup/version.rb

@@ -1,3 +1,12 @@
+def git_suffix
+  revision = `GIT_DIR=#{__dir__}/../../.git git rev-parse HEAD 2>/dev/null`
+  if revision.empty?
+    "-git-unknown"
+  else
+    "-git-#{revision[0..7]}"
+  end
+end
+
 module Redwood
-  VERSION = "0.22.1"
+  VERSION = "1.1"
 end

data/lib/sup.rb

@@ -26,7 +26,7 @@ class Module
     props = props.map { |p| p.to_s }
 
     path = name.gsub(/::/, "/")
-    yaml_tag "!#{Redwood::YAML_DOMAIN},#{Redwood::YAML_DATE}/#{path}"
+    yaml_tag "tag:#{Redwood::YAML_DOMAIN},#{Redwood::YAML_DATE}/#{path}"
 
     define_method :init_with do |coder|
       initialize(*coder.map.values_at(*props))
@@ -38,9 +38,6 @@ class Module
         hash
       end
     end
-
-    # Legacy
-    Psych.load_tags["!#{Redwood::LEGACY_YAML_DOMAIN},#{Redwood::YAML_DATE}/#{path}"] = self
   end
 end
 
@@ -139,10 +136,17 @@ module Redwood
 
   def load_yaml_obj fn, compress=false
     o = if File.exist? fn
-      if compress
-        Zlib::GzipReader.open(fn) { |f| YAML::load f }
+      raw_contents = if compress
+        Zlib::GzipReader.open(fn) { |f| f.read }
+      else
+        File::open(fn) { |f| f.read }
+      end
+      ## fix up malformed tag URIs created by earlier versions of sup
+      raw_contents.gsub!(/!supmua.org,2006-10-01\/(\S*)$/) { |m| "!<tag:supmua.org,2006-10-01/#{$1}>" }
+      if YAML.respond_to?(:unsafe_load)  # Ruby 3.1+
+        YAML::unsafe_load raw_contents
       else
-        YAML::load_file fn
+        YAML::load raw_contents
       end
     end
     if o.is_a?(Array)
@@ -331,6 +335,7 @@ EOM
       :poll_interval => 300,
       :wrap_width => 0,
       :slip_rows => 0,
+      :indent_spaces => 2,
       :col_jump => 2,
       :stem_language => "english",
       :sync_back_to_maildir => false,
@@ -348,7 +353,7 @@ EOM
       name ||= ENV["USER"]
       email = ENV["USER"] + "@" +
         begin
-          Socket.gethostbyname(Socket.gethostname).first
+          Addrinfo.getaddrinfo(Socket.gethostname, 'smtp').first.getnameinfo.first
         rescue SocketError
           Socket.gethostname
         end

data/man/sup-add.1

@@ -1,10 +1,13 @@
-.TH "SUP\-ADD" "1" "April 9, 2012" "Sup User Manual" ""
+.\" Automatically generated by Pandoc 2.9.2.1
+.\"
+.TH "SUP-ADD" "1" "April 9, 2012" "Sup User Manual" ""
+.hy
 .SH NAME
 .PP
-sup\-add \- add a source to the Sup source list
+sup-add - add a source to the Sup source list
 .SH SYNOPSIS
 .PP
-sup\-add [\f[I]options\f[]] [\f[I]source uri...\f[]]
+sup-add [\f[I]options\f[R]] [\f[I]source uri\&...\f[R]]
 .SH DESCRIPTION
 .PP
 Add one ore more sources to the Sup source list
@@ -13,67 +16,51 @@ For mbox files on local disk, use the form:
 .IP
 .nf
 \f[C]
-mbox:<path\ to\ mbox\ file>,\ or
+mbox:<path to mbox file>, or
 
-mbox://<path\ to\ mbox\ file>
-\f[]
+mbox://<path to mbox file>
+\f[R]
 .fi
 .PP
 For Maildir folders, use the form:
 .IP
 .nf
 \f[C]
-maildir:<path\ to\ Maildir\ directory>;\ or
+maildir:<path to Maildir directory>; or
 
-maildir://<path\ to\ Maildir\ directory>
-\f[]
+maildir://<path to Maildir directory>
+\f[R]
 .fi
 .SH OPTIONS
 .TP
-.B \-a, \-\-archive
+-a, --archive
 Automatically archive all new messages from thesesources.
-.RS
-.RE
 .TP
-.B \-u, \-\-unusual
+-u, --unusual
 Do not automatically poll these sources for new messages.
-.RS
-.RE
 .TP
-.B \-l \f[I]STRING\f[], \-\-labels \f[I]STRING\f[]
-A comma\-separated set of labels to apply to all messages from this
+-l \f[I]STRING\f[R], --labels \f[I]STRING\f[R]
+A comma-separated set of labels to apply to all messages from this
 source
-.RS
-.RE
 .TP
-.B \-f, \-\-force\-new
+-f, --force-new
 Create a new account for this source, even if one already exists
-.RS
-.RE
 .TP
-.B \-o \f[I]STRING\f[], \-\-force\-account \f[I]STRING\f[]
-Reuse previously defined account user\@hostname
-.RS
-.RE
+-o \f[I]STRING\f[R], --force-account \f[I]STRING\f[R]
+Reuse previously defined account user\[at]hostname
 .TP
-.B \-v, \-\-version
+-v, --version
 Print version and exit
-.RS
-.RE
 .TP
-.B \-h, \-\-help
+-h, --help
 Show help message
-.RS
-.RE
 .SH FILES
 .TP
-.B $HOME/.sup/sources.yaml
+$HOME/.sup/sources.yaml
 Configuration file for Sup mail sources
-.RS
-.RE
 .SH SEE ALSO
 .PP
-sup(1), sup\-config(1)
+sup(1), sup-config(1)
 .SH REPORTING BUGS
 .PP
 You are welcome to submit bug reports to the Sup issue tracker, located
@@ -82,39 +69,31 @@ at
 <https://github.com/sup-heliotrope/sup/issues>
 .SH CONTACT INFORMATION
 .TP
-.B The Sup web page:
-<http://supmua.org/>
-.RS
-.RE
+The Sup web page:
+<https://sup-heliotrope.github.io/>
 .TP
-.B Code repository:
+Code repository:
 <https://github.com/sup-heliotrope/sup/>
-.RS
-.RE
 .TP
-.B Sup Wiki:
+Sup Wiki:
 <https://github.com/sup-heliotrope/sup/wiki/>
-.RS
-.RE
 .TP
-.B Sup IRC channel:
-#sup \@ freenode.net
-.RS
-.RE
+Sup IRC channel:
+#sup \[at] freenode.net
 .TP
-.B Mailing list:
-supmua\@googlegroups.com
+Mailing list:
+supmua\[at]googlegroups.com
 .RS
 .PP
-supmua+subscribe\@googlegroups.com
+supmua+subscribe\[at]googlegroups.com
 .PP
 Archives: <https://groups.google.com/d/forum/supmua/>
 .RE
 .SH COPYRIGHT
 .PP
-Copyright © 2006\-2009 William Morgan <mworgan-sup@masanjin.net>
+Copyright \[co] 2006-2009 William Morgan <mworgan-sup@masanjin.net>
 .PP
-Copyright \@ 2013\-2014 Sup developers
+Copyright \[at] 2013-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)

data/man/sup-config.1

@@ -1,39 +1,34 @@
-.TH "SUP\-CONFIG" "1" "April 9, 2012" "Sup User Manual" ""
+.\" Automatically generated by Pandoc 2.9.2.1
+.\"
+.TH "SUP-CONFIG" "1" "April 9, 2012" "Sup User Manual" ""
+.hy
 .SH NAME
 .PP
-sup\-config \- interactive configuration tool for Sup
+sup-config - interactive configuration tool for Sup
 .SH SYNOPSIS
 .PP
-sup\-config [\f[I]options\f[]]
+sup-config [\f[I]options\f[R]]
 .SH DESCRIPTION
 .PP
 Interactive configuration tool for Sup.
-Won\[aq]t destroy existing configuration.
+Won\[cq]t destroy existing configuration.
 .SH OPTIONS
 .TP
-.B \-v, \-\-version
+-v, --version
 Print versian and exit
-.RS
-.RE
 .TP
-.B \-h, \-\-help
+-h, --help
 Show help message
-.RS
-.RE
 .SH FILES
 .TP
-.B $HOME/.sup/config.yaml
+$HOME/.sup/config.yaml
 Configuration file for Sup
-.RS
-.RE
 .TP
-.B $HOME/.sup/sources.yaml
+$HOME/.sup/sources.yaml
 Configuration file for Sup mail sources
-.RS
-.RE
 .SH SEE ALSO
 .PP
-sup(1), sup\-add(1)
+sup(1), sup-add(1)
 .SH REPORTING BUGS
 .PP
 You are welcome to submit bug reports to the Sup issue tracker, located
@@ -42,39 +37,31 @@ at
 <https://github.com/sup-heliotrope/sup/issues>
 .SH CONTACT INFORMATION
 .TP
-.B The Sup web page:
-<http://supmua.org/>
-.RS
-.RE
+The Sup web page:
+<https://sup-heliotrope.github.io/>
 .TP
-.B Code repository:
+Code repository:
 <https://github.com/sup-heliotrope/sup/>
-.RS
-.RE
 .TP
-.B Sup Wiki:
+Sup Wiki:
 <https://github.com/sup-heliotrope/sup/wiki/>
-.RS
-.RE
 .TP
-.B Sup IRC channel:
-#sup \@ freenode.net
-.RS
-.RE
+Sup IRC channel:
+#sup \[at] freenode.net
 .TP
-.B Mailing list:
-supmua\@googlegroups.com
+Mailing list:
+supmua\[at]googlegroups.com
 .RS
 .PP
-supmua+subscribe\@googlegroups.com
+supmua+subscribe\[at]googlegroups.com
 .PP
 Archives: <https://groups.google.com/d/forum/supmua/>
 .RE
 .SH COPYRIGHT
 .PP
-Copyright © 2006\-2009 William Morgan <mworgan-sup@masanjin.net>
+Copyright \[co] 2006-2009 William Morgan <mworgan-sup@masanjin.net>
 .PP
-Copyright \@ 2013\-2014 Sup developers
+Copyright \[at] 2013-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)

data/man/sup-dump.1

@@ -1,49 +1,47 @@
-.TH "SUP\-DUMP" "1" "April 9, 2012" "Sup User Manual" ""
+.\" Automatically generated by Pandoc 2.9.2.1
+.\"
+.TH "SUP-DUMP" "1" "April 9, 2012" "Sup User Manual" ""
+.hy
 .SH NAME
 .PP
-sup\-dump \- dumps message state from Sup index
+sup-dump - dumps message state from Sup index
 .SH SYNOPSIS
 .PP
-sup\-dump [\f[I]options\f[]]
+sup-dump [\f[I]options\f[R]]
 .SH DESCRIPTION
 .PP
 Dumps all message state from the Sup index to standard out.
-You can later use sup\-sync \-\-restored \-\-restore to recover the
-index.
+You can later use sup-sync --restored --restore to recover the index.
 .PP
 This tool is primarily useful in the event that a Sup upgrade breaks
 index format compatibility.
 .SH OPTIONS
 .TP
-.B \-v, \-\-version
+-v, --version
 Print version and exit
-.RS
-.RE
 .TP
-.B \-h, \-\-help
+-h, --help
 Show help message
-.RS
-.RE
 .SH EXAMPLES
 .PP
 Dump message state and store in file
 .IP
 .nf
 \f[C]
-sup\-dump\ >\ filename
-\f[]
+sup-dump > filename
+\f[R]
 .fi
 .PP
 Dump message state and compress output to store in file
 .IP
 .nf
 \f[C]
-sup\-dump\ |\ bzip2\ >\ filename.bz2
-\f[]
+sup-dump | bzip2 > filename.bz2
+\f[R]
 .fi
 .SH SEE ALSO
 .PP
-sup(1), sup\-sync(1), sup\-import\-dump(1)
+sup(1), sup-sync(1), sup-import-dump(1)
 .SH REPORTING BUGS
 .PP
 You are welcome to submit bug reports to the Sup issue tracker, located
@@ -52,39 +50,31 @@ at
 <https://github.com/sup-heliotrope/sup/issues>
 .SH CONTACT INFORMATION
 .TP
-.B The Sup web page:
-<http://supmua.org/>
-.RS
-.RE
+The Sup web page:
+<https://sup-heliotrope.github.io/>
 .TP
-.B Code repository:
+Code repository:
 <https://github.com/sup-heliotrope/sup/>
-.RS
-.RE
 .TP
-.B Sup Wiki:
+Sup Wiki:
 <https://github.com/sup-heliotrope/sup/wiki/>
-.RS
-.RE
 .TP
-.B Sup IRC channel:
-#sup \@ freenode.net
-.RS
-.RE
+Sup IRC channel:
+#sup \[at] freenode.net
 .TP
-.B Mailing list:
-supmua\@googlegroups.com
+Mailing list:
+supmua\[at]googlegroups.com
 .RS
 .PP
-supmua+subscribe\@googlegroups.com
+supmua+subscribe\[at]googlegroups.com
 .PP
 Archives: <https://groups.google.com/d/forum/supmua/>
 .RE
 .SH COPYRIGHT
 .PP
-Copyright © 2006\-2009 William Morgan <mworgan-sup@masanjin.net>
+Copyright \[co] 2006-2009 William Morgan <mworgan-sup@masanjin.net>
 .PP
-Copyright \@ 2013\-2014 Sup developers
+Copyright \[at] 2013-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)