sup 0.19.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d330a3455ed22952d8c45fce0f6a0d69346c40f2
-  data.tar.gz: 337b95be43bc301f6180b542b2395df025f4f1db
+  metadata.gz: 703c8b0175724e4a3a4965081e8a0b12fb01147a
+  data.tar.gz: 86557dfd9de2f477dbf4f8322cd732c221d51c9d
 SHA512:
-  metadata.gz: f538e3054ba742a5fadd296bcb6d29b0295e3ca807a0dfe600d908b3cfa9602697bd4e422ac5bde8facb603fe12784add4709ccc4f5ca9b7b76bf348cec3a6f3
-  data.tar.gz: 1923d32e3cfc13998e52bc7c53b19482f6a4ed9b13d4e79880a1a6a16d926b26af2e6aaa73d1ea6556a6d2cdaf51aae1979afc51eff01697df9801dd787a45a3
+  metadata.gz: ba46b62b4cd8059cd1835624270e715da259934f4f497f56471e81bd02876b83518c8b647ed4c1d0f43520f0a42fcdbec500b6a8b1abb4002bfdea7fe5e44ddd
+  data.tar.gz: 0e5f694ae6cd39770120ef26163a68bddb8179baa6cbcaec87acdbee17be1627cc9520c802427dd5f4958c7d367017034cf62360acddedef27f8a95d27b288cf

data/.gitignore

@@ -4,6 +4,7 @@
 *~
 # artifact
 pkg/
+man/
 *.gem
 # i have accidently added this one one too many times
 sup-exception-log.txt
@@ -14,4 +15,8 @@ Gemfile.lock
 
 # generated file for gnupg test
 test/gnupg_test_home/random_seed
+test/gnupg_test_home/trustdb.gpg
+test/gnupg_test_home/.gpg-v21-migrated
+test/gnupg_test_home/private-keys-v1.d
+
 

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "doc/wiki"]
+	path = doc/wiki
+	url = https://github.com/sup-heliotrope/sup.wiki.git

data/.travis.yml

@@ -3,10 +3,11 @@ language: ruby
 rvm:
   - 2.1.1
   - 2.0.0
-  - 1.9.3
+  - 2.2.0
 
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -qq uuid-dev uuid libncursesw5-dev libncursesw5 gnupg2
+  - sudo apt-get install -qq uuid-dev uuid libncursesw5-dev libncursesw5 gnupg2 pandoc
+  - git submodule update --init --recursive
 
 script: bundle exec rake travis

data/CONTRIBUTORS

@@ -3,28 +3,31 @@ Rich Lane
 Gaute Hope <eg at the gaute.vetsj dot coms>
 Whyme Lyu <callme5long at the gmail dot coms>
 Hamish Downer <dmishd at the gmail dot coms>
+Zeger-Jan van de Weg <mail at the zjvandeweg dot nls>
 Damien Leone <damien.leone at the fensalir dot frs>
 Sascha Silbe <sascha-pgp at the silbe dot orgs>
 Eric Weikl <eric.weikl at the gmx dot nets>
 Paweł Wilk <siefca at the gnu dot orgs>
 Ismo Puustinen <ismo at the iki dot fis>
+Matthieu Rakotojaona <matthieu.rakotojaona at the gmail dot coms>
 Nicolas Pouillard <nicolas.pouillard at the gmail dot coms>
 Michael Stapelberg <michael at the stapelberg dot des>
 Eric Sherman <hyperbolist at the gmail dot coms>
 Tero Tilus <tero at the tilus dot nets>
 Ben Walton <bwalton at the artsci.utoronto dot cas>
+Scott Bonds <scott at the ggr dot coms>
 Mike Stipicevic <stipim at the rpi dot edus>
 Martin Bähr <mbaehr at the societyserver dot orgs>
+Timon Vonk <timonv at the gmail dot coms>
 Clint Byrum <clint at the ubuntu dot coms>
 Wael M. Nasreddine <wael.nasreddine at the gmail dot coms>
 Marcus Williams <marcus-sup at the bar-coded dot nets>
-Matthieu Rakotojaona <matthieu.rakotojaona at the gmail dot coms>
 Lionel Ott <white.magic at the gmx dot des>
 Gaudenz Steinlin <gaudenz at the soziologie dot chs>
-Ingmar Vanhassel <ingmar at the exherbo dot orgs>
+Per Andersson <avtobiff at the gmail dot coms>
 Mark Alexander <marka at the pobox dot coms>
+Ingmar Vanhassel <ingmar at the exherbo dot orgs>
 Edward Z. Yang <ezyang at the mit dot edus>
-Timon Vonk <timonv at the gmail dot coms>
 julien@macbook <julien.stechele at the gmail dot coms>
 Christopher Warrington <chrisw at the rice dot edus>
 W. Trevor King <wking at the drexel dot edus>
@@ -37,8 +40,8 @@ Markus Klinik
 Bo Borgerson <gigabo at the gmail dot coms>
 Atte Kojo <atte.kojo at the reaktor dot fis>
 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>
+William Erik Baxter <web at the superscript dot coms>
 Grant Hollingworth <grant at the antiflux dot orgs>
 Ico Doornekamp <ico at the pruts dot nls>
 Adeodato Simó <dato at the net.com.org dot ess>
@@ -48,6 +51,7 @@ Jason Petsod
 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>
+rjg-vB <rthrd at the web dot des>
 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>
@@ -56,29 +60,31 @@ Andrew Pimlott
 Jeff Balogh <its.jeff.balogh at the gmail dot coms>
 Matías Aguirre <matiasaguirre at the gmail dot coms>
 PaulSmecker <paul.smecker at the gmail dot coms>
+Ruthard Baudach <rthrd at the web dot des>
 Kornilios Kourtis <kkourt at the cslab.ece.ntua dot grs>
 Lars Fischer <fischer at the wiwi.uni-siegen dot des>
 madhat2r <MaDhAt2r at the dukefoo dot coms>
-Giorgio Lando <patroclo7 at the gmail dot coms>
 Kevin Riggle <kevinr at the free-dissociation dot coms>
+Giorgio Lando <patroclo7 at the gmail dot coms>
 Benoît PIERRE <benoit.pierre at the gmail dot coms>
-Alvaro Herrera <alvherre at the alvh.no-ip dot orgs>
 Steven Lawrance <stl at the koffein dot nets>
+Alvaro Herrera <alvherre at the alvh.no-ip dot orgs>
 Jonah <Jonah at the GoodCoffee dot cas>
 ian <itaylor at the uark dot edus>
-Adam Lloyd <adam at the alloy-d dot nets>
+Elias Norberg <xyzzy at the kudzu dot ses>
+0xACE <0xACE at the users.noreply.github dot coms>
 MichaelRevell <mikearevell at the gmail dot coms>
 Gregor Hoffleit <gregor at the sam.mediasupervision dot des>
+Adam Lloyd <adam at the alloy-d dot nets>
 Todd Eisenberger <teisenbe at the andrew.cmu dot edus>
-Per Andersson <avtobiff at the gmail dot coms>
-0xACE <0xACE at the users.noreply.github dot coms>
+Johannes Larsen <mail at the johslarsen dot nets>
+Sharif Olorin <sio at the tesser dot orgs>
 Steven Schmeiser <steven at the schmeiser dot orgs>
 Steven Walter <swalter at the monarch.(none)>
-Jon M. Dugan <jdugan at the es dot nets>
-akojo <atte.kojo at the gmail dot coms>
-Matthias Vallentin <vallentin at the icir dot orgs>
 William A. Kennington III <william at the wkennington dot coms>
+akojo <atte.kojo at the gmail dot coms>
 Horacio Sanson <horacio at the skillupjapan.co dot jps>
+Matthias Vallentin <vallentin at the icir dot orgs>
+Jon M. Dugan <jdugan at the es dot nets>
 Stefan Lundström <lundst at the snabb.(none)>
-Johannes Larsen <johs.a.larsen at the gmail dot coms>
 Kirill Smelkov <kirr at the landau.phys.spbu dot rus>

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org/'
 
+if !RbConfig::CONFIG['arch'].include?('openbsd')
+  gem 'xapian-ruby', '~> 1.2.15'
+end
+
 gemspec

data/History.txt

@@ -1,3 +1,44 @@
+== 0.22.1 / 2015-06-18
+
+* Fix bug (#429)  in gem build / install.
+
+== 0.22.0 / 2015-06-16
+
+* Use mime-types 2
+* Fix ruby style (Zeger-Jan van de Weg)
+* Johannes Larsen: fix long-standing bug with draft-id mixups causing
+  drafts to disappear.
+* Various bugs and minor improvements.
+
+== 0.21.0 / 2015-02-12
+
+* Key binding to fetch GPG key from keyserver (Matthieu Rakotojaona)
+* Replace occurences of File.exists? with File.exist? (Zeger-Jan van de
+  Weg)
+* You can now unsubscribe from mailinglists using an url, if you have a
+  goto-hook setup (Timon Vonk).
+* Forward attribution can be customized using the forward-attribution
+  hook (Ruthard Baudach)
+* Do a few more checks for buffer not nil in the hope to fix a few
+  random crashes
+* Add bash completion (Per Andersson)
+* Replace dl/import with Fiddle (Timon Vonk)
+* Drop support for ruby 1.9.3
+* Add tests for contact manager and persons (Zeger-Jan van de Weg)
+
+== 0.20.0 / 2014-10-06
+
+* add man-pages (generated from wiki) (Per Andersson)!
+* HTML messages or messages that are decoded with the mime-decode hook
+  are now indexed if the mime-decode hook is set up (Scott Bonds).
+* OpenBSD support (Scott Bonds)!
+* goto-hook for keybinding to open URLs.
+* support special charaters in source URIs (Scott Bonds).
+* output message id and locations on all load_from_source failures
+* fix long-standing getlocal bug
+* make new test GPG keys (old ones expired), valid for one year, script
+  now available in devel/ for making new ones.
+
 == 0.19.0 / 2014-07-05
 
 * new check-attachment hook

data/Rakefile

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'rake/testtask'
 require "bundler/gem_tasks"
 
@@ -9,4 +8,45 @@ Rake::TestTask.new(:test) do |test|
 end
 task :default => :test
 
+task :build => [:man]
 task :travis => [:test, :build]
+
+def test_pandoc
+  return system("pandoc -v > /dev/null 2>&1")
+end
+
+task :man do
+  puts "building manpages from wiki.."
+  unless test_pandoc
+    puts "no pandoc installed, needed for manpage generation."
+    return
+  end
+
+  # test if wiki is cloned
+  unless Dir.exist? 'doc/wiki/man'
+    puts "wiki git repository is not cloned in doc/wiki, try: git submodule update --init."
+    return
+  end
+
+  unless Dir.exist? 'man'
+    Dir.mkdir 'man'
+  end
+
+  Dir.glob("doc/wiki/man/*.md").each do |md|
+    m = /^.*\/(?<manpage>[^\/]*)\.md$/.match(md)[:manpage]
+    puts "generating manpage for: #{m}.."
+    r = system "pandoc -s -f markdown -t man #{md} -o man/#{m}"
+
+    unless r
+      puts "failed to generate manpage: #{m}."
+      return
+    end
+  end
+end
+
+task :clean do
+  ['man', 'pkg'].each do |d|
+    puts "cleaning #{d}.."
+    FileUtils.rm_r d if Dir.exist? d
+  end
+end

data/ReleaseNotes

@@ -1,3 +1,20 @@
+Release 0.21.0:
+
+Several small features as well as polishing (including fetching a GPG key with
+a shortcut and unsubscribing from mailinglist using an url). Several old
+deprecated parts of sup have been modernized. Support for Ruby 1.9.3 has been
+dropped. Have a look in History.txt for the details.
+
+Release 0.20.0:
+
+We've got man pages (Mr. Andersson)! We've got OpenBSD support (Scott Bonds)!
+It is now possible to get your HTML emails indexed by setting up a mime-decode
+hook before you index (Scott Bonds)! Scott Bonds also fixed up special character handing in source URIs. It is now possible to set up a goto hook
+for opening the URL below the cursor.
+
+Also a few long standing bugs have been fixed, and new GPG keys have been made
+for the tests.
+
 Release 0.19.0:
 
 New hook: check-attachment and a new option to shows dates in 24h format.

data/bin/sup

@@ -3,10 +3,10 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'rubygems'
 require 'ncursesw'
 
 require 'sup/util/ncurses'
+require 'sup/util/locale_fiddler'
 
 no_gpgme = false
 begin
@@ -102,27 +102,14 @@ global_keymap = Keymap.new do |k|
   end
 end
 
-## the following magic enables wide characters when used with a ruby
-## 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.
-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
 
-  debug "dynamically loading setlocale() from #{setlocale_lib}"
+unless RbConfig::CONFIG['arch'] =~ /openbsd/
+  debug "dynamically loading setlocale()"
   begin
-    dlload setlocale_lib
-    extern "void setlocale(int, const char *)"
+    class LibC; extend LocaleFiddler; end
     debug "setting locale..."
-    LibC.setlocale(6, "")  # LC_ALL == 6
+    LibC.setlocale(6, "")
   rescue RuntimeError => e
     warn "cannot dlload setlocale(); ncurses wide character support probably broken."
     warn "dlload error was #{e.class}: #{e.message}"

data/bin/sup-add

@@ -3,7 +3,6 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'uri'
-require 'rubygems'
 require 'highline/import'
 require 'trollop'
 require "sup"
@@ -95,7 +94,7 @@ begin
       next
     end
 
-    parsed_uri = URI(uri)
+    parsed_uri = URI(URI.escape(uri))
 
     source =
       case parsed_uri.scheme

data/bin/sup-config

@@ -2,7 +2,6 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'rubygems'
 require 'highline/import'
 require 'trollop'
 require "sup"

data/bin/sup-dump

@@ -2,7 +2,6 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'rubygems'
 require 'xapian'
 require 'trollop'
 require 'set'

data/bin/sup-import-dump

@@ -3,7 +3,6 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'uri'
-require 'rubygems'
 require 'trollop'
 require "sup"
 
@@ -82,7 +81,7 @@ begin
     next if opts[:dry_run]
 
     m.labels = new_labels
-    index.update_message_state m
+    index.update_message_state [m, false]
   end
 
   index.commit_transaction if opts[:atomic]

data/bin/sup-sync

@@ -3,7 +3,6 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'uri'
-require 'rubygems'
 require 'trollop'
 require "sup"
 

data/bin/sup-sync-back-maildir

@@ -3,7 +3,6 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'rubygems'
 require 'trollop'
 require "sup"
 
@@ -60,7 +59,7 @@ $config[:sync_back_to_maildir] = true
 
 begin
   sync_performed = []
-  sync_performed = File.readlines(Redwood::SYNC_OK_FN).collect { |e| e.strip }.find_all { |e| not e.empty? } if File.exists? Redwood::SYNC_OK_FN
+  sync_performed = File.readlines(Redwood::SYNC_OK_FN).collect { |e| e.strip }.find_all { |e| not e.empty? } if File.exist? Redwood::SYNC_OK_FN
   sources = []
 
   ## Try to find out sources given in parameters

data/bin/sup-tweak-labels

@@ -2,7 +2,6 @@
 
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
-require 'rubygems'
 require 'trollop'
 require "sup"
 
@@ -83,7 +82,7 @@ begin
     ## query to only messages with those labels
     query += " (" + remove_labels.map { |l| "label:#{l}" }.join(" OR ") + ")"
   end
-  query += ' ' + opts[:query] if opts[:query]
+  query += ' AND ' + opts[:query] if opts[:query]
 
   parsed_query = index.parse_query query
   parsed_query.merge! :load_spam => true, :load_deleted => true, :load_killed => true

data/contrib/colorpicker.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-
 require 'ncursesw'
 
 Ncurses.initscr

data/contrib/completion/_sup.bash

@@ -0,0 +1,102 @@
+# Sup Bash completion
+#
+# * Complete options for all Sup commands.
+# * Disable completion for next option when current option takes an argument.
+# * Complete sources, directories, and files, where applicable.
+
+_sup_cmds() {
+    local cur prev opts sources
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    sources="$(sed -n '/uri:/ {s/.*uri:\s*//p}' $HOME/.sup/sources.yaml)"
+
+    case "${1##/*}" in
+        sup-add)
+            opts="--archive -a --unusual -u --sync-back --no-sync-back -s
+                  --labels -l --force-new -f --force-account -o --version -v
+                  --help -h mbox: maildir:"
+
+            case $prev in
+                --labels|-l|--force-account|-o)
+                    COMPREPLY=()
+                    return 0
+                    ;;
+            esac
+            ;;
+        sup-config|sup-dump)
+            opts="--version -v --help -h"
+            ;;
+        sup-import-dump)
+           opts="--verbose -v --ignore-missing -i --warn-missing -w
+                 --abort-missing -a --atomic -t --dry-run -n --version --help
+                 -h"
+            ;;
+        sup)
+            opts="--list-hooks -l --no-threads -n --no-initial-poll -o --search
+                  -s --compose -c --subject -j --version -v --help -h"
+
+            case $prev in
+                --search|-s|--compose|-c|--subject|-j)
+                    COMPREPLY=()
+                    return 0
+                    ;;
+            esac
+            ;;
+        sup-recover-sources)
+            opts="--unusual --archive --scan-num --help -h $sources"
+
+            case $prev in
+                --scan-num)
+                    COMPREPLY=()
+                    return 0
+                    ;;
+            esac
+            ;;
+        sup-sync)
+            opts="--asis --restore --discard --archive -x --read -r
+                  --extra-labels --verbose -v --optimize -o --all-sources
+                  --dry-run -n --version --help -h ${sources}"
+
+
+            case $prev in
+                --restore|--extra-labels)
+                    COMPREPLY=()
+                    return 0
+                    ;;
+            esac
+            ;;
+        sup-sync-back-maildir)
+            maildir_sources="$(echo $sources | tr ' ' '\n' | grep maildir)"
+            opts="--no-confirm -n --no-merge -m --list-sources -l
+                  --unusual-sources-too -u --version -v --help -h
+                  $maildir_sources"
+            ;;
+        sup-tweak-labels)
+            opts="--add -a --remove -r --query -q --verbose -v --very-verbose
+                  -e --all-sources --dry-run -n --no-sync-back -o --version
+                  --help -h $sources"
+
+            case $prev in
+                --add|-a|--remove|-r|--query|-q)
+                    COMPREPLY=()
+                    return 0
+                    ;;
+            esac
+            ;;
+    esac
+
+    COMPREPLY=( $(compgen -W "$opts" -- ${cur}) )
+    return 0
+}
+
+complete -F _sup_cmds sup \
+                      sup-add \
+                      sup-config \
+                      sup-dump \
+                      sup-recover-sources \
+                      sup-sync \
+                      sup-sync-back-maildir \
+                      sup-tweak-labels
+
+complete -F _sup_cmds -o filenames -o plusdirs sup-import-dump