Rmail to Mail: initial work

.travis.yml

@@ -3,7 +3,6 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
-  - 1.8.7
 
 before_install:
   - sudo apt-get update -qq
@@ -14,3 +13,4 @@ script: bundle exec rake travis
 matrix:
   allow_failures:
     - rvm: 2.0.0
+    - rvm: 1.9.3

CONTRIBUTORS

@@ -1,8 +1,8 @@
-William Morgan <wmorgan-sup at the masanjin dot nets>
+William Morgan <william at the twitter dot coms>
 Rich Lane <rlane at the club.cc.cmu dot edus>
 Gaute Hope <eg at the gaute.vetsj dot coms>
-Hamish Downer <dmishd at the gmail dot coms>
 Whyme Lyu <callme5long at the gmail dot coms>
+Hamish Downer <dmishd at the gmail dot coms>
 Sascha Silbe <sascha-pgp at the silbe dot orgs>
 Ismo Puustinen <ismo at the iki dot fis>
 Nicolas Pouillard <nicolas.pouillard at the gmail dot coms>
@@ -21,47 +21,46 @@ Eric Weikl <eric.weikl at the tngtech dot coms>
 Christopher Warrington <chrisw at the rice dot edus>
 W. Trevor King <wking at the drexel dot edus>
 Richard Brown <rbrown at the exherbo dot orgs>
+Anthony Martinez <pi+sup at the pihost dot uss>
 Marc Hartstein <marc.hartstein at the alum.vassar dot edus>
 Israel Herraiz <israel.herraiz at the gmail dot coms>
-Anthony Martinez <pi+sup at the pihost dot uss>
 Bo Borgerson <gigabo at the gmail dot coms>
-William Erik Baxter <web at the superscript dot coms>
 Michael Hamann <michael at the content-space dot des>
+William Erik Baxter <web at the superscript dot coms>
+Jonathan Lassoff <jof at the thejof dot coms>
 Grant Hollingworth <grant at the antiflux dot orgs>
+Markus Klinik <markus.klinik at the gmx dot des>
+Ico Doornekamp <ico at the pruts dot nls>
 Adeodato Simó <dato at the net.com.org dot ess>
 Daniel Schoepe <daniel.schoepe at the googlemail dot coms>
 Jason Petsod <jason at the petsod dot orgs>
-Steve Goldman <sgoldman at the tower-research dot coms>
+Edward Z. Yang <edwardzyang at the thewritingpot dot coms>
 Robin Burchell <viroteck at the viroteck dot nets>
+Steve Goldman <sgoldman at the tower-research dot coms>
 Peter Harkins <ph at the malaprop dot orgs>
-Edward Z. Yang <ezyang at the MIT dot EDUs>
 Decklin Foster <decklin at the red-bean dot coms>
 Cameron Matheson <cam+sup at the cammunism dot orgs>
 Carl Worth <cworth at the cworth dot orgs>
+Alex Vandiver <alex at the chmrr dot nets>
 Jeff Balogh <its.jeff.balogh at the gmail dot coms>
-Alex Vandiver <alexmv at the mit dot edus>
 Andrew Pimlott <andrew at the pimlott dot nets>
 Matías Aguirre <matiasaguirre at the gmail dot coms>
-Anthony Martinez <pi at the pihost dot uss>
 Kornilios Kourtis <kkourt at the cslab.ece.ntua dot grs>
-Kevin Riggle <kevinr at the free-dissociation dot coms>
 Giorgio Lando <patroclo7 at the gmail dot coms>
+Kevin Riggle <kevinr at the free-dissociation dot coms>
 Benoît PIERRE <benoit.pierre at the gmail dot coms>
 Alvaro Herrera <alvherre at the alvh.no-ip dot orgs>
-Eric Weikl <eric.weikl at the gmx dot nets>
+Steven Lawrance <stl at the koffein dot nets>
 Jonah <Jonah at the GoodCoffee dot cas>
-ian <ian at the lorf dot orgs>
-Adam Lloyd <adam at the alloy-d dot nets>
+ian <itaylor at the uark dot edus>
+MichaelRevell <mikearevell at the gmail dot coms>
+Gregor Hoffleit <gregor at the sam.mediasupervision dot des>
 Todd Eisenberger <teisenbe at the andrew.cmu dot edus>
+Adam Lloyd <adam at the alloy-d dot nets>
 Steven Walter <swalter at the monarch.(none)>
-Alex Vandiver <alex at the chmrr dot nets>
-Gregor Hoffleit <gregor at the sam.mediasupervision dot des>
 Jon M. Dugan <jdugan at the es dot nets>
 Matthieu Rakotojaona <matthieu.rakotojaona at the gmail dot coms>
-Stefan Lundström <lundst at the snabb.(none)>
 Matthias Vallentin <vallentin at the icir dot orgs>
-Steven Lawrance <stl at the redhat dot coms>
-Jonathan Lassoff <jof at the thejof dot coms>
-ian <itaylor at the uark dot edus>
-Gregor Hoffleit <gregor at the hoffleit dot des>
+Stefan Lundström <lundst at the snabb.(none)>
+Whyme.Lyu <callme5long at the gmail dot coms>
 Kirill Smelkov <kirr at the landau.phys.spbu dot rus>

Gemfile

@@ -1,3 +1,3 @@
-source 'http://rubygems.org/'
+source 'https://rubygems.org/'
 
 gemspec

History.txt

@@ -1,3 +1,12 @@
+== 0.13.2 / 2013-06-26
+
+* FreeBSD 10 comptability
+* More threadsafe polling
+
+== 0.13.1 / 2013-06-21
+
+* Bugfixes
+
 == 0.13.0 / 2013-05-15
 
 * Bugfixes

ReleaseNotes

@@ -1,3 +1,11 @@
+Release 0.13.2:
+
+FreeBSD compatability and more thread safe polling.
+
+Release 0.13.1:
+
+Another ruby 1.8 compatible release, various fixes.
+
 Release 0.13.0:
 
 Collection of bugfixes and stability fixes since 0.12.1. We now depend on our

bin/sup

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 #!/usr/bin/env ruby
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
@@ -106,15 +108,14 @@ end
 ## ncurses.so that's been compiled against libncursesw. (note the w.) why
 ## this works, i have no idea. much like pretty much every aspect of
 ## dealing with curses.  cargo cult programming at its best.
-##
-## BSD users: if libc.so.6 is not found, try installing compat6x.
 require 'dl/import'
 require 'rbconfig'
 module LibC
   extend DL.const_defined?(:Importer) ? DL::Importer : DL::Importable
   setlocale_lib = case RbConfig::CONFIG['arch']
     when /darwin/; "libc.dylib"
     when /cygwin/; "cygwin1.dll"
+    when /freebsd/; "libc.so.7"
     else; "libc.so.6"
   end
 
@@ -127,9 +128,6 @@ module LibC
   rescue RuntimeError => e
     warn "cannot dlload setlocale(); ncurses wide character support probably broken."
     warn "dlload error was #{e.class}: #{e.message}"
-    if RbConfig::CONFIG['arch'] =~ /bsd/
-      warn "BSD variant detected. You may have to install a compat6x package to acquire libc."
-    end
   end
 end
 
@@ -162,7 +160,11 @@ begin
 
   $die = false
   trap("TERM") { |x| $die = true }
-  trap("WINCH") { |x| BufferManager.sigwinch_happened! }
+  trap("WINCH") do |x|
+   ::Thread.new do
+     BufferManager.sigwinch_happened!
+   end
+  end
 
   if(s = Redwood::SourceManager.source_for DraftManager.source_name)
     DraftManager.source = s
@@ -294,8 +296,8 @@ begin
       b.mode.load_in_background if new
     when :search
       completions = LabelManager.all_labels.map { |l| "label:#{LabelManager.string_for l}" }
-      completions = completions.each { |l| l.force_encoding 'UTF-8' if l.methods.include?(:encoding) }
-      completions += ["from:", "to:", "after:", "before:", "date:", "limit:", "AND", "OR", "NOT"]
+      completions = completions.each { |l| l.fix_encoding }
+      completions += Index::COMPL_PREFIXES
       query = BufferManager.ask_many_with_completions :search, "Search all messages (enter for saved searches): ", completions
       unless query.nil?
         if query.empty?
@@ -308,7 +310,7 @@ begin
       SearchResultsMode.spawn_from_query "is:unread"
     when :list_labels
       labels = LabelManager.all_labels.map { |l| LabelManager.string_for l }
-      labels = labels.each { |l| l.force_encoding 'UTF-8' if l.methods.include?(:encoding) }
+      labels = labels.each { |l| l.fix_encoding }
 
       user_label = bm.ask_with_completions :label, "Show threads with label (enter for listing): ", labels
       unless user_label.nil?
@@ -416,7 +418,7 @@ unless Redwood::exceptions.empty?
 We are very sorry. It seems that an error occurred in Sup. Please
 accept our sincere apologies. Please submit the contents of
 #{BASE_DIR}/exception-log.txt and a brief report of the
-circumstances to https://github.com/sup-heliotrope/sup/issues so that 
+circumstances to https://github.com/sup-heliotrope/sup/issues so that
 we might address this problem. Thank you!
 
 Sincerely,

bin/sup-migrate-index

@@ -0,0 +1,110 @@
+#!/usr/bin/env ruby
+
+require 'uri'
+require 'rubygems'
+require 'trollop'
+require "sup"; Redwood::check_library_version_against "git"
+
+PROGRESS_UPDATE_INTERVAL = 15 # seconds
+
+class AbortExecution < SystemExit
+end
+
+opts = Trollop::options do
+  version "sup-migrate-index (sup #{Redwood::VERSION})"
+  banner <<EOS
+Updates the index from version 4 to 5 by changing ids and references to safe
+ids.
+
+Usage:
+  sup-migrate-index [options]
+
+Options:
+EOS
+  opt :verbose, "Print message ids as they're processed."
+  opt :ignore_missing, "Silently skip over messages that are not in the index."
+  opt :warn_missing, "Warn about messages that are not in the index, but continue."
+  opt :abort_missing, "Abort on encountering messages that are not in the index. (default)"
+  opt :atomic, "Use transaction to apply all changes atomically."
+  opt :dry_run, "Don't actually modify the index. Probably only useful with --verbose.", :short => "-n"
+  opt :version, "Show version information", :short => :none
+
+  conflicts :ignore_missing, :warn_missing, :abort_missing
+end
+Trollop::die "Extra arguments given" if ARGV.length > 1
+missing_action = [:ignore_missing, :warn_missing, :abort_missing].find { |x| opts[x] } || :abort_missing
+
+BASE_DIR = ENV["SUP_BASE"] || File.join(ENV["HOME"], ".sup")
+
+
+Redwood::start
+index = Redwood::Index.init
+
+#index.lock_interactively or exit
+
+
+info "Starting migration to version 5.."
+
+index.load true
+
+xapian = index.get_xapian
+db_version = xapian.get_metadata 'version'
+db_version = '0' if db_version.empty?
+
+fail "It only makes sense to migrate from version 4 to 5, you have an index version #{db_version}" unless db_version == '4'
+
+num_docs = 0
+xapian.postlist('Kmail').each do |x|
+  info "Updating document: #{x.inspect}"
+  num_docs += 1
+
+  doc = xapian.document(x.docid)
+  entry = doc.entry
+
+  debug "Working on entry: #{entry[:message_id]}."
+
+  debug "Adding missing fields.."
+  entry[:safe_id] = Redwood::Message.munge_msgid(entry[:message_id])
+  entry[:safe_refs] += entry[:refs].nil? ? [] : entry[:refs].compact.map { |r| rr = Redwood::Message.munge_msgid(r); debug "addin ref #{r} -> #{rr}.."; rr }
+  entry[:safe_refs] = entry[:safe_refs].uniq
+
+
+  entry[:safe_replytos] = entry[:replytos].nil? ? [] : entry[:replytos].compact.map { |r| rr = Redwood::Message.munge_msgid(r); debug "addin replyto #{r} -> #{rr}.."; rr }
+
+  next if opts[:dry_run]
+  doc.entry = entry
+
+  info "Storing message.."
+  xapian.replace_document x.docid, doc
+  k = xapian.document x.docid
+  info "stored safe_id: " + k.value(0)
+
+  debug "Loading message.."
+  #locations = entry[:locations].map do |source_id,source_info|
+    #source = Redwood::SourceManager[source_id]
+    #raise "invalid source #{source_id}" unless source
+    #Redwood::Location.new source, source_info
+  #end
+
+  #m = Redwood::Message.new :locations => locations,
+                  #:labels => entry[:labels],
+                  #:snippet => entry[:snippet]
+
+  ## Try to find person from contacts before falling back to
+  ## generating it from the address.
+  #mk_person = lambda { |x| Redwood::Person.from_name_and_email(*x.reverse!) }
+  #entry[:from] = mk_person[entry[:from]]
+  #entry[:to].map!(&mk_person)
+  #entry[:cc].map!(&mk_person)
+  #entry[:bcc].map!(&mk_person)
+
+  #m.load_from_index! entry
+  #m.load_from_source!
+
+  break
+
+
+end
+
+info "done, updated: #{num_docs} documents."
+

bin/sup-psych-ify-config-files

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
+
+require "sup"
+require "fileutils"
+
+Redwood.start
+
+fn = Redwood::SOURCE_FN
+FileUtils.cp fn, "#{fn}.syck_bak"
+
+Redwood::SourceManager.load_sources fn
+Redwood::SourceManager.save_sources fn, true
+
+Redwood.finish

bin/sup-tweak-labels

@@ -85,7 +85,7 @@ begin
 
   parsed_query = index.parse_query query
   parsed_query.merge! :load_spam => true, :load_deleted => true, :load_killed => true
-  ids = Enumerator.new(index, :each_id, parsed_query)
+  ids = index.to_enum(:each_safe_id, parsed_query)
   num_total = index.num_results_for parsed_query
 
   $stderr.puts "Found #{num_total} documents across #{source_ids.length} sources. Scanning..."

devel/console.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-irb -I lib -r devel/start-console.rb
+irb -I lib -r ./devel/start-console.rb

doc/FAQ.txt

@@ -21,8 +21,8 @@ A: I hate ads, I hate using a mouse, and I hate non-programmability and
 
 Q: Why the console?
 A: Because a keystroke is worth a hundred mouse clicks, as any Unix
-   user knows. Because you don't need web browser. Because you get
-   instantaneous response and a simple interface.
+   user knows. Because you don't need a web browser. Because you get
+   an instantaneous response and a simple interface.
 
 Q: How does Sup deal with spam?
 A: You can manually mark messages as spam, which prevents them from