sup 0.13.2.1 → 0.14.0

data/lib/sup/textfield.rb

@@ -168,6 +168,16 @@ private
     else # trailing spaces
       v + (" " * (x - @question.length - v.length))
     end
+
+    # ncurses returns a ASCII-8BIT (binary) string, which
+    # bytes presumably are of current charset encoding. we force_encoding
+    # so that the char representation / string is tagged will be the
+    # system locale and also hopefully the terminal/input encoding. an
+    # incorrectly configured terminal encoding (not matching the system
+    # encoding) will produce erronous results, but will also do that for
+    # a log of other programs since it is impossible to detect which is
+    # which and what encoding the inputted byte chars are supposed to have.
+    v.force_encoding($encoding).fix_encoding
   end
 
   def remove_extra_space

data/lib/sup/util.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'thread'
 require 'lockfile'
 require 'mime/types'
@@ -5,7 +7,7 @@ require 'pathname'
 require 'set'
 require 'enumerator'
 require 'benchmark'
-require 'iconv'
+require 'unicode'
 
 ## time for some monkeypatching!
 class Symbol
@@ -31,7 +33,7 @@ class Lockfile
   def dump_lock_id lock_id = @lock_id
       "host: %s\npid: %s\nppid: %s\ntime: %s\nuser: %s\npname: %s\n" %
         lock_id.values_at('host','pid','ppid','time','user', 'pname')
-    end
+  end
 
   def lockinfo_on_disk
     h = load_lock_id IO.read(path)
@@ -114,6 +116,25 @@ module RMail
   end
 
   class Header
+
+    # Convert to ASCII before trying to match with regexp
+    class Field
+
+      EXTRACT_FIELD_NAME_RE = /\A([^\x00-\x1f\x7f-\xff :]+):\s*/no
+
+      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
@@ -234,14 +255,14 @@ class Object
 end
 
 class String
-  ## nasty multibyte hack for ruby 1.8. if it's utf-8, split into chars using
-  ## the utf8 regex and count those. otherwise, use the byte length.
   def display_length
-    if RUBY_VERSION < '1.9.1' && ($encoding == "UTF-8" || $encoding == "utf8")
-      # scan hack is somewhat slow, worth trying to cache
-      @display_length ||= scan(/./u).size
-    else
-      size
+    @display_length ||= Unicode.width(self, false)
+  end
+
+  def slice_by_display_length len
+    each_char.each_with_object "" do |c, buffer|
+      len -= c.display_length
+      buffer << c if len >= 0
     end
   end
 
@@ -328,20 +349,69 @@ class String
   def wrap len
     ret = []
     s = self
-    while s.length > len
-      cut = s[0 ... len].rindex(/\s/)
+    while s.display_length > len
+      cut = s.slice_by_display_length(len).rindex(/\s/)
       if cut
         ret << s[0 ... cut]
         s = s[(cut + 1) .. -1]
       else
-        ret << s[0 ... len]
-        s = s[len .. -1]
+        ret << s.slice_by_display_length(len)
+        s = s[ret.last.length .. -1]
       end
     end
     ret << s
   end
 
+  # Fix the damn string! make sure it is valid utf-8, then convert to
+  # user encoding.
+  #
+  # Not Ruby 1.8 compatible
+  def fix_encoding
+    # first try to encode to utf-8 from whatever current encoding
+    encode!('UTF-8', :invalid => :replace, :undef => :replace)
+
+    # do this anyway in case string is set to be UTF-8, encoding to
+    # something else (UTF-16 which can fully represent UTF-8) and back
+    # ensures invalid chars are replaced.
+    encode!('UTF-16', 'UTF-8', :invalid => :replace, :undef => :replace)
+    encode!('UTF-8', 'UTF-16', :invalid => :replace, :undef => :replace)
+
+    fail "Could not create valid UTF-8 string out of: '#{self.to_s}'." unless valid_encoding?
+
+    # now convert to $encoding
+    encode!($encoding, :invalid => :replace, :undef => :replace)
+
+    fail "Could not create valid #{$encoding.inspect} string out of: '#{self.to_s}'." unless valid_encoding?
+
+    self
+  end
+
+  # transcode the string if original encoding is know
+  # fix if broken.
+  #
+  # Not Ruby 1.8 compatible
+  def transcode to_encoding, from_encoding
+    begin
+      encode!(to_encoding, from_encoding, :invalid => :replace, :undef => :replace)
+
+      unless valid_encoding?
+        # fix encoding (through UTF-8)
+        encode!('UTF-16', from_encoding, :invalid => :replace, :undef => :replace)
+        encode!(to_encoding, 'UTF-16', :invalid => :replace, :undef => :replace)
+      end
+
+    rescue Encoding::ConverterNotFoundError
+      debug "Encoding converter not found for #{from_encoding.inspect} or #{to_encoding.inspect}, fixing string: '#{self.to_s}', but expect weird characters."
+      fix_encoding
+    end
+
+    fail "Could not create valid #{to_encoding.inspect} string out of: '#{self.to_s}'." unless valid_encoding?
+
+    self
+  end
+
   def normalize_whitespace
+    fix_encoding
     gsub(/\t/, "    ").gsub(/\r/, "")
   end
 
@@ -383,12 +453,8 @@ class String
         out << b.chr
       end
     end
-    out.force_encoding Encoding::UTF_8 if out.respond_to? :force_encoding
-    out
-  end
-
-  def transcode src_encoding=$encoding
-    Iconv.easy_decode $encoding, src_encoding, self
+    out = out.fix_encoding # this should now be an utf-8 string of ascii
+                           # compat chars.
   end
 
   unless method_defined? :ascii_only?
@@ -659,27 +725,3 @@ class FinishLine
   end
 end
 
-class Iconv
-  def self.easy_decode target, orig_charset, text
-    if text.respond_to? :force_encoding
-      text = text.dup
-      text.force_encoding Encoding::BINARY
-    end
-    charset = case orig_charset
-      when /UTF[-_ ]?8/i then "utf-8"
-      when /(iso[-_ ])?latin[-_ ]?1$/i then "ISO-8859-1"
-      when /iso[-_ ]?8859[-_ ]?15/i then 'ISO-8859-15'
-      when /unicode[-_ ]1[-_ ]1[-_ ]utf[-_]7/i then "utf-7"
-      when /^euc$/i then 'EUC-JP' # XXX try them all?
-      when /^(x-unknown|unknown[-_ ]?8bit|ascii[-_ ]?7[-_ ]?bit)$/i then 'ASCII'
-      else orig_charset
-    end
-
-    begin
-      returning(Iconv.iconv(target + "//IGNORE", charset, text + " ").join[0 .. -2]) { |str| str.check }
-    rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::InvalidCharacter, Iconv::IllegalSequence, String::CheckError
-      debug "couldn't transcode text from #{orig_charset} (#{charset}) to #{target} (#{text[0 ... 20].inspect}...): got #{$!.class} (#{$!.message})"
-      text.ascii
-    end
-  end
-end

data/lib/sup/util/query.rb

@@ -0,0 +1,14 @@
+module Redwood
+  module Util
+    module Query
+      class QueryDescriptionError < ArgumentError; end
+
+      def self.describe query
+        d = query.description.force_encoding("UTF-8")
+
+        raise QueryDescriptionError.new(d) unless d.valid_encoding?
+        return d
+      end
+    end
+  end
+end

data/lib/sup/version.rb

@@ -1,3 +1,3 @@
 module Redwood
-  VERSION = "0.13.2.1"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sup
 version: !ruby/object:Gem::Version
-  version: 0.13.2.1
+  version: 0.14.0
   prerelease: 
   segments:
   - 0
-  - 13
-  - 2
-  - 1
-  hash: 3165895177967591158
+  - 14
+  - 0
+  hash: 3076317061437341881
 platform: ruby
 authors:
 - William Morgan
@@ -18,21 +17,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: xapian-full-alaveteli
+  name: xapian-ruby
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
-        prerelease: 
-        segments:
-        - 1
-        - 2
-        hash: 868825659676859863
+        version: 1.2.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -40,56 +34,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
-        prerelease: 
-        segments:
-        - 1
-        - 2
-        hash: 868825659676859863
+        version: 1.2.15
 - !ruby/object:Gem::Dependency
   name: ncursesw-sup
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-        prerelease: 
-        segments:
-        - 1
-        - 3
-        hash: 507327302350482719
-    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.1
-        prerelease: 
-        segments:
-        - 1
-        - 3
-        - 1
-        hash: 3105951872946229212
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-        prerelease: 
-        segments:
-        - 1
-        - 3
-        hash: 507327302350482719
-    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.1
-        prerelease: 
-        segments:
-        - 1
-        - 3
-        - 1
-        hash: 3105951872946229212
 - !ruby/object:Gem::Dependency
   name: rmail
   requirement: !ruby/object:Gem::Requirement
@@ -98,11 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.17'
-        prerelease: 
-        segments:
-        - 0
-        - 17
-        hash: 3437085760670918924
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -111,35 +67,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.17'
-        prerelease: 
-        segments:
-        - 0
-        - 17
-        hash: 3437085760670918924
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: true
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-        prerelease: 
-        segments:
-        - 0
-        hash: 780439954604562836
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: true
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-        prerelease: 
-        segments:
-        - 0
-        hash: 780439954604562836
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -148,11 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.12'
-        prerelease: 
-        segments:
-        - 1
-        - 12
-        hash: -1471803907522368170
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -161,35 +99,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.12'
-        prerelease: 
-        segments:
-        - 1
-        - 12
-        hash: -1471803907522368170
 - !ruby/object:Gem::Dependency
   name: lockfile
   requirement: !ruby/object:Gem::Requirement
-    none: true
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-        prerelease: 
-        segments:
-        - 0
-        hash: 780439954604562836
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: true
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-        prerelease: 
-        segments:
-        - 0
-        hash: 780439954604562836
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -197,11 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1'
-        prerelease: 
-        segments:
-        - 1
-        hash: -2685865212927832791
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -209,11 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1'
-        prerelease: 
-        segments:
-        - 1
-        hash: -2685865212927832791
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: locale
   requirement: !ruby/object:Gem::Requirement
@@ -222,11 +139,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-        prerelease: 
-        segments:
-        - 2
-        - 0
-        hash: -535226096568000350
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -235,55 +147,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-        prerelease: 
-        segments:
-        - 2
-        - 0
-        hash: -535226096568000350
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-        prerelease: 
-        segments:
-        - 0
-        - 9
-        hash: 2184205100294773721
-    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.1
-        prerelease: 
-        segments:
-        - 0
-        - 9
-        - 1
-        hash: -1556404584947433146
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-        prerelease: 
-        segments:
-        - 0
-        - 9
-        hash: 2184205100294773721
-    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.1
-        prerelease: 
-        segments:
-        - 0
-        - 9
-        - 1
-        hash: -1556404584947433146
+- !ruby/object:Gem::Dependency
+  name: unicode
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -323,7 +218,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -331,7 +226,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -339,7 +234,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -347,7 +242,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.5
+- !ruby/object:Gem::Dependency
+  name: gpgme
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 description: ! "      Sup is a console-based email client for people with a lot of
   email.\n\n      * GMail-like thread-centered archiving, tagging and muting\n      *
   Handling mail from multiple mbox and Maildir sources\n      * Blazing fast full-text
@@ -365,6 +276,7 @@ executables:
 - sup-sync
 - sup-sync-back
 - sup-tweak-labels
+- sup-psych-ify-config-files
 extensions: []
 extra_rdoc_files: []
 files:
@@ -382,7 +294,9 @@ files:
 - bin/sup-sync
 - bin/sup-sync-back
 - bin/sup-tweak-labels
+- bin/sup-psych-ify-config-files
 - lib/sup/hook.rb
+- lib/sup/util/query.rb
 - lib/sup/util/uri.rb
 - lib/sup/util/path.rb
 - lib/sup/horizontal_selector.rb
@@ -448,7 +362,9 @@ files:
 homepage: http://supmua.org
 licenses:
 - GPL-2
-post_install_message: 
+post_install_message: ! "SUP: Please run `sup-psych-ify-config-files` to migrate from
+  0.13 to 0.14.\n\nSUP: Check https://github.com/sup-heliotrope/sup/wiki/Migration-0.13-to-0.14\n
+  \    for more detailed up-to-date instructions.\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -457,7 +373,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: