sup 1.0 → 1.1

data/lib/sup/modes/file_browser_mode.rb

@@ -43,7 +43,7 @@ protected
   end
 
   def view
-     name, f = @files[curpos - RESERVED_ROWS]
+    _name, f = @files[curpos - RESERVED_ROWS]
     return unless f && f.file?
 
     begin
@@ -54,7 +54,7 @@ protected
   end
 
   def select_file_or_follow_directory
-    name, f = @files[curpos - RESERVED_ROWS]
+    _name, f = @files[curpos - RESERVED_ROWS]
     return unless f
 
     if f.directory? && f.to_s != "."

data/lib/sup/modes/label_list_mode.rb

@@ -129,7 +129,7 @@ protected
   end
 
   def select_label
-    label, num_unread = @labels[curpos]
+    label, _num_unread = @labels[curpos]
     return unless label
     LabelSearchResultsMode.spawn_nicely label
   end

data/lib/sup/modes/search_list_mode.rb

@@ -131,13 +131,13 @@ protected
   end
 
   def select_search
-    name, num_unread = @searches[curpos]
+    name, _num_unread = @searches[curpos]
     return unless name
     SearchResultsMode.spawn_from_query SearchManager.search_string_for(name)
   end
 
   def delete_selected_search
-    name, num_unread = @searches[curpos]
+    name, _num_unread = @searches[curpos]
     return unless name
     reload if SearchManager.delete name
   end

data/lib/sup/modes/thread_view_mode.rb

@@ -241,7 +241,7 @@ EOS
 
       begin
         u = URI.parse($1)
-      rescue URI::InvalidURIError => e
+      rescue URI::InvalidURIError
         BufferManager.flash("Invalid unsubscribe link")
         return
       end
@@ -868,7 +868,6 @@ private
       (0 ... text.length).each do |i|
         @chunk_lines[@text.length + i] = m
         @message_lines[@text.length + i] = m
-        lw = text[i].flatten.select { |x| x.is_a? String }.map { |x| x.display_length }.sum
       end
 
       @text += text

data/lib/sup/rfc2047.rb

@@ -17,7 +17,7 @@
 # This file is distributed under the same terms as Ruby.
 
 module Rfc2047
-  WORD = %r{=\?([!\#$%&'*+-/0-9A-Z\\^\`a-z{|}~]+)\?([BbQq])\?([!->@-~]+)\?=} # :nodoc: 'stupid ruby-mode
+  WORD = %r{=\?([!\#$%&'*+-/0-9A-Z\\^\`a-z{|}~]+)\?([BbQq])\?([!->@-~ ]+)\?=} # :nodoc: 'stupid ruby-mode
   WORDSEQ = %r{(#{WORD.source})\s+(?=#{WORD.source})}
 
   def Rfc2047.is_encoded? s; s =~ WORD end
@@ -28,16 +28,17 @@ module Rfc2047
   # converted to the target encoding, it is left in its encoded form.
   def Rfc2047.decode_to(target, from)
     from = from.gsub(WORDSEQ, '\1')
-    out = from.gsub(WORD) do
+    from.gsub(WORD) do
       |word|
       charset, encoding, text = $1, $2, $3
 
       # B64 or QP decode, as necessary:
       case encoding
         when 'b', 'B'
-          #puts text
-          text = text.unpack('m*')[0]
-          #puts text.dump
+          ## Padding is optional in RFC 2047 words. Add some extra padding
+          ## before decoding the base64, otherwise on Ruby 2.0 the final byte
+          ## might be discarded.
+          text = (text + '===').unpack('m*')[0]
 
         when 'q', 'Q'
           # RFC 2047 has a variant of quoted printable where a ' ' character
@@ -50,7 +51,21 @@ module Rfc2047
         # WORD.
       end
 
-      text.transcode(target, charset)
+      # Handle UTF-7 specially because Ruby doesn't actually support it as
+      # a normal character encoding.
+      if charset == 'UTF-7'
+        begin
+          next text.decode_utf7.encode(target)
+        rescue ArgumentError, EncodingError
+          next word
+        end
+      end
+
+      begin
+        text.force_encoding(charset).encode(target)
+      rescue ArgumentError, EncodingError
+        word
+      end
     end
   end
 end

data/lib/sup/source.rb

@@ -102,7 +102,7 @@ class Source
   end
 
   def synchronize &block
-    @poll_lock.synchronize &block
+    @poll_lock.synchronize(&block)
   end
 
   def try_lock
@@ -153,7 +153,7 @@ class Source
       next unless Rfc2047.is_encoded? v
       header[k] = begin
         Rfc2047.decode_to $encoding, v
-      rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::IllegalSequence => e
+      rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::IllegalSequence
         #debug "warning: error decoding RFC 2047 header (#{e.class.name}): #{e.message}"
         v
       end
@@ -169,6 +169,12 @@ protected
   def Source.expand_filesystem_uri uri
     uri.gsub "~", File.expand_path("~")
   end
+
+  def Source.encode_path_for_uri path
+    path.gsub(Regexp.new("[#{Regexp.quote(URI_ENCODE_CHARS)}]")) { |c|
+      c.each_byte.map { |x| sprintf("%%%02X", x) }.join
+    }
+  end
 end
 
 ## if you have a @labels instance variable, include this

data/lib/sup/textfield.rb

@@ -119,7 +119,6 @@ class TextField
         Ncurses::Form::REQ_END_FIELD
       when Ncurses::KEY_UP, Ncurses::KEY_DOWN
         unless !@i || @history.empty?
-          value = get_cursed_value
           #debug "history before #{@history.inspect}"
           @i = @i + (c.is_keycode?(Ncurses::KEY_UP) ? -1 : 1)
           @i = 0 if @i < 0

data/lib/sup/thread.rb

@@ -407,7 +407,6 @@ class ThreadSet
     #puts "adding: #{message.id}, refs #{message.refs.inspect}"
 
     el.message = message
-    oldroot = el.root
 
     ## link via references:
     (message.refs + [el.id]).inject(nil) do |prev, ref_id|

data/lib/sup/util.rb

@@ -4,6 +4,7 @@ require 'thread'
 require 'lockfile'
 require 'mime/types'
 require 'pathname'
+require 'rmail'
 require 'set'
 require 'enumerator'
 require 'benchmark'
@@ -11,7 +12,7 @@ require 'unicode'
 require 'unicode/display_width'
 require 'fileutils'
 
-class Lockfile
+module ExtendedLockfile
   def gen_lock_id
     Hash[
          'host' => "#{ Socket.gethostname }",
@@ -37,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
@@ -106,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
@@ -118,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
@@ -392,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
 
@@ -405,7 +381,7 @@ class String
 
   unless method_defined? :each
     def each &b
-      each_line &b
+      each_line(&b)
     end
   end
 
@@ -507,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 = {}
@@ -563,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

@@ -8,5 +8,5 @@ def git_suffix
 end
 
 module Redwood
-  VERSION = "1.0"
+  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)
@@ -349,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,4 +1,4 @@
-.\" Automatically generated by Pandoc 2.7.3
+.\" Automatically generated by Pandoc 2.9.2.1
 .\"
 .TH "SUP-ADD" "1" "April 9, 2012" "Sup User Manual" ""
 .hy
@@ -33,30 +33,30 @@ maildir://<path to Maildir directory>
 .fi
 .SH OPTIONS
 .TP
-.B -a, --archive
+-a, --archive
 Automatically archive all new messages from thesesources.
 .TP
-.B -u, --unusual
+-u, --unusual
 Do not automatically poll these sources for new messages.
 .TP
-.B -l \f[I]STRING\f[R], --labels \f[I]STRING\f[R]
+-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
 .TP
-.B -f, --force-new
+-f, --force-new
 Create a new account for this source, even if one already exists
 .TP
-.B -o \f[I]STRING\f[R], --force-account \f[I]STRING\f[R]
+-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
 .TP
-.B -h, --help
+-h, --help
 Show help message
 .SH FILES
 .TP
-.B $HOME/.sup/sources.yaml
+$HOME/.sup/sources.yaml
 Configuration file for Sup mail sources
 .SH SEE ALSO
 .PP
@@ -69,19 +69,19 @@ at
 <https://github.com/sup-heliotrope/sup/issues>
 .SH CONTACT INFORMATION
 .TP
-.B The Sup web page:
-<http://supmua.org/>
+The Sup web page:
+<https://sup-heliotrope.github.io/>
 .TP
-.B Code repository:
+Code repository:
 <https://github.com/sup-heliotrope/sup/>
 .TP
-.B Sup Wiki:
+Sup Wiki:
 <https://github.com/sup-heliotrope/sup/wiki/>
 .TP
-.B Sup IRC channel:
+Sup IRC channel:
 #sup \[at] freenode.net
 .TP
-.B Mailing list:
+Mailing list:
 supmua\[at]googlegroups.com
 .RS
 .PP

data/man/sup-config.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pandoc 2.7.3
+.\" Automatically generated by Pandoc 2.9.2.1
 .\"
 .TH "SUP-CONFIG" "1" "April 9, 2012" "Sup User Manual" ""
 .hy
@@ -14,17 +14,17 @@ Interactive configuration tool for Sup.
 Won\[cq]t destroy existing configuration.
 .SH OPTIONS
 .TP
-.B -v, --version
+-v, --version
 Print versian and exit
 .TP
-.B -h, --help
+-h, --help
 Show help message
 .SH FILES
 .TP
-.B $HOME/.sup/config.yaml
+$HOME/.sup/config.yaml
 Configuration file for Sup
 .TP
-.B $HOME/.sup/sources.yaml
+$HOME/.sup/sources.yaml
 Configuration file for Sup mail sources
 .SH SEE ALSO
 .PP
@@ -37,19 +37,19 @@ at
 <https://github.com/sup-heliotrope/sup/issues>
 .SH CONTACT INFORMATION
 .TP
-.B The Sup web page:
-<http://supmua.org/>
+The Sup web page:
+<https://sup-heliotrope.github.io/>
 .TP
-.B Code repository:
+Code repository:
 <https://github.com/sup-heliotrope/sup/>
 .TP
-.B Sup Wiki:
+Sup Wiki:
 <https://github.com/sup-heliotrope/sup/wiki/>
 .TP
-.B Sup IRC channel:
+Sup IRC channel:
 #sup \[at] freenode.net
 .TP
-.B Mailing list:
+Mailing list:
 supmua\[at]googlegroups.com
 .RS
 .PP

data/man/sup-dump.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pandoc 2.7.3
+.\" Automatically generated by Pandoc 2.9.2.1
 .\"
 .TH "SUP-DUMP" "1" "April 9, 2012" "Sup User Manual" ""
 .hy
@@ -17,10 +17,10 @@ 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
 .TP
-.B -h, --help
+-h, --help
 Show help message
 .SH EXAMPLES
 .PP
@@ -50,19 +50,19 @@ at
 <https://github.com/sup-heliotrope/sup/issues>
 .SH CONTACT INFORMATION
 .TP
-.B The Sup web page:
-<http://supmua.org/>
+The Sup web page:
+<https://sup-heliotrope.github.io/>
 .TP
-.B Code repository:
+Code repository:
 <https://github.com/sup-heliotrope/sup/>
 .TP
-.B Sup Wiki:
+Sup Wiki:
 <https://github.com/sup-heliotrope/sup/wiki/>
 .TP
-.B Sup IRC channel:
+Sup IRC channel:
 #sup \[at] freenode.net
 .TP
-.B Mailing list:
+Mailing list:
 supmua\[at]googlegroups.com
 .RS
 .PP

data/man/sup-import-dump.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pandoc 2.7.3
+.\" Automatically generated by Pandoc 2.9.2.1
 .\"
 .TH "SUP-IMPORT-DUMP" "1" "April 9, 2012" "Sup User Manual" ""
 .hy
@@ -18,29 +18,29 @@ If you need to recreate the index, see sup-sync --restore instead.
 Messages not mentioned in the dump file will not be modified.
 .SH OPTIONS
 .TP
-.B -v, --verbose
+-v, --verbose
 Print message ids as they\[cq]re processed
 .TP
-.B -i, --ignore-missing
+-i, --ignore-missing
 Silently skip over messages that are not in the index
 .TP
-.B -w, --warn-missing
+-w, --warn-missing
 Warn about messages that are not in the index, but continue
 .TP
-.B -a, --abort-missing
+-a, --abort-missing
 Abort on encountering messages that are not in the index (default)
 .TP
-.B -t, --atomic
+-t, --atomic
 Use transaction to apply all changes atomically
 .TP
-.B -n, --dry-run
+-n, --dry-run
 Don\[cq]t actually modify the index.
 Probably only useful with --verbose
 .TP
-.B --version
+--version
 Show version information
 .TP
-.B -h, --help
+-h, --help
 Show help message
 .SH SEE ALSO
 .PP
@@ -53,19 +53,19 @@ at
 <https://github.com/sup-heliotrope/sup/issues>
 .SH CONTACT INFORMATION
 .TP
-.B The Sup web page:
-<http://supmua.org/>
+The Sup web page:
+<https://sup-heliotrope.github.io/>
 .TP
-.B Code repository:
+Code repository:
 <https://github.com/sup-heliotrope/sup/>
 .TP
-.B Sup Wiki:
+Sup Wiki:
 <https://github.com/sup-heliotrope/sup/wiki/>
 .TP
-.B Sup IRC channel:
+Sup IRC channel:
 #sup \[at] freenode.net
 .TP
-.B Mailing list:
+Mailing list:
 supmua\[at]googlegroups.com
 .RS
 .PP

data/man/sup-psych-ify-config-files.1

@@ -1,4 +1,4 @@
-.\" Automatically generated by Pandoc 2.7.3
+.\" Automatically generated by Pandoc 2.9.2.1
 .\"
 .TH "SUP-SYNC" "1" "September 3, 2014" "Sup User Manual" ""
 .hy
@@ -22,10 +22,10 @@ Read more on the Sup wiki
 https://github.com/sup-heliotrope/sup/wiki/Migration-0.13-to-0.14
 .SH FILES
 .TP
-.B $HOME/.sup/config.yaml
+$HOME/.sup/config.yaml
 Sup configuration file
 .TP
-.B $HOME/.sup/sources.yaml
+$HOME/.sup/sources.yaml
 Configuration file for Sup mail sources
 .SH SEE ALSO
 .PP
@@ -38,19 +38,19 @@ at
 <https://github.com/sup-heliotrope/sup/issues>
 .SH CONTACT INFORMATION
 .TP
-.B The Sup web page:
-<http://supmua.org/>
+The Sup web page:
+<https://sup-heliotrope.github.io/>
 .TP
-.B Code repository:
+Code repository:
 <https://github.com/sup-heliotrope/sup/>
 .TP
-.B Sup Wiki:
+Sup Wiki:
 <https://github.com/sup-heliotrope/sup/wiki/>
 .TP
-.B Sup IRC channel:
+Sup IRC channel:
 #sup \[at] freenode.net
 .TP
-.B Mailing list:
+Mailing list:
 supmua\[at]googlegroups.com
 .RS
 .PP