sup 0.13.1 → 0.13.2

data/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>
@@ -11,6 +11,7 @@ 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>
 Mike Stipicevic <stipim at the rpi dot edus>
+Whyme.Lyu <callme5long at the gmail dot coms>
 Marcus Williams <marcus-sup at the bar-coded dot nets>
 Lionel Ott <white.magic at the gmx dot des>
 Gaudenz Steinlin <gaudenz at the soziologie dot chs>
@@ -21,47 +22,44 @@ 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>
 Grant Hollingworth <grant at the antiflux dot orgs>
+Markus Klinik <markus.klinik at the gmx dot des>
 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>
-Jeff Balogh <its.jeff.balogh at the gmail dot coms>
-Alex Vandiver <alexmv at the mit dot edus>
+Alex Vandiver <alex at the chmrr dot nets>
 Andrew Pimlott <andrew at the pimlott dot nets>
+Jeff Balogh <its.jeff.balogh at the gmail dot coms>
 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>
 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>
+ian <itaylor at the uark dot edus>
+MichaelRevell <mikearevell at the gmail dot coms>
 Adam Lloyd <adam at the alloy-d dot nets>
 Todd Eisenberger <teisenbe at the andrew.cmu dot edus>
-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>
+Steven Walter <swalter at the monarch.(none)>
+Jonathan Lassoff <jof at the thejof dot coms>
 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>
+Jon M. Dugan <jdugan at the es dot nets>
 Kirill Smelkov <kirr at the landau.phys.spbu dot rus>

data/History.txt

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

data/ReleaseNotes

@@ -1,3 +1,7 @@
+Release 0.13.2:
+
+FreeBSD compatability and more thread safe polling.
+
 Release 0.13.1:
 
 Another ruby 1.8 compatible release, various fixes.

data/bin/sup

@@ -106,8 +106,6 @@ 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
@@ -115,6 +113,7 @@ module LibC
   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 +126,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
 

data/lib/sup/message.rb

@@ -540,7 +540,9 @@ private
   def inline_gpg_to_chunks body, encoding_to, encoding_from
     lines = body.split("\n")
     gpg = lines.between(GPG_SIGNED_START, GPG_SIGNED_END)
-    if !gpg.empty?
+    # between does not check if GPG_END actually exists
+    # Reference: http://permalink.gmane.org/gmane.mail.sup.devel/641
+    if !gpg.empty? && !lines.index(GPG_END).nil?
       msg = RMail::Message.new
       msg.body = gpg.join("\n")
 

data/lib/sup/poll.rb

@@ -22,7 +22,7 @@ Variables:
                    num: the total number of new messages added in this poll
              num_inbox: the number of new messages added in this poll which
                         appear in the inbox (i.e. were not auto-archived).
-             num_total: the total number of messages 
+             num_total: the total number of messages
        num_inbox_total: the total number of new messages in the inbox.
 num_inbox_total_unread: the total number of unread messages in the inbox
          from_and_subj: an array of (from email address, subject) pairs
@@ -35,7 +35,7 @@ EOS
     @mutex = Mutex.new
     @thread = nil
     @last_poll = nil
-    @polling = false
+    @polling = Mutex.new
     @poll_sources = nil
     @mode = nil
     @should_clear_running_totals = false
@@ -57,15 +57,15 @@ EOS
     @running_totals[:num] += num
     @running_totals[:numi] += numi
     @running_totals[:loaded_labels] += loaded_labels || []
-   
-    
+
+
     if HookManager.enabled? "after-poll"
       hook_args = { :num => num, :num_inbox => numi,
                     :num_total => @running_totals[:num], :num_inbox_total => @running_totals[:numi],
-                    :from_and_subj => from_and_subj, :from_and_subj_inbox => from_and_subj_inbox, 
+                    :from_and_subj => from_and_subj, :from_and_subj_inbox => from_and_subj_inbox,
                     :num_inbox_total_unread => lambda { Index.num_results_for :labels => [:inbox, :unread] } }
 
-      HookManager.run("after-poll", hook_args) 
+      HookManager.run("after-poll", hook_args)
     else
       if @running_totals[:num] > 0
         BufferManager.flash "Loaded #{@running_totals[:num].pluralize 'new message'}, #{@running_totals[:numi]} to inbox. Labels: #{@running_totals[:loaded_labels].map{|l| l.to_s}.join(', ')}"
@@ -77,21 +77,27 @@ EOS
   end
 
   def poll
-    return if @polling
-    @polling = true
-    @poll_sources = SourceManager.usual_sources
-    num, numi = poll_with_sources
-    @polling = false
-    [num, numi]
+    if @polling.try_lock
+      @poll_sources = SourceManager.usual_sources
+      num, numi = poll_with_sources
+      @polling.unlock
+      [num, numi]
+    else
+      debug "poll already in progress."
+      return
+    end
   end
 
   def poll_unusual
-    return if @polling
-    @polling = true
-    @poll_sources = SourceManager.unusual_sources
-    num, numi = poll_with_sources
-    @polling = false
-    [num, numi]
+    if @polling.try_lock
+      @poll_sources = SourceManager.unusual_sources
+      num, numi = poll_with_sources
+      @polling.unlock
+      [num, numi]
+    else
+      debug "poll_unusual already in progress."
+      return
+    end
   end
 
   def start
@@ -157,7 +163,6 @@ EOS
       loaded_labels = loaded_labels - LabelManager::HIDDEN_RESERVED_LABELS - [:inbox, :killed]
       yield "Done polling; loaded #{total_num} new messages total"
       @last_poll = Time.now
-      @polling = false
     end
     [total_num, total_numi, from_and_subj, from_and_subj_inbox, loaded_labels]
   end
@@ -166,42 +171,51 @@ EOS
   ## labels and locations set correctly. The Messages are saved to or removed
   ## from the index after being yielded.
   def poll_from source, opts={}
-    begin
-      source.poll do |sym, args|
-        case sym
-        when :add
-          m = Message.build_from_source source, args[:info]
-          old_m = Index.build_message m.id
-          m.labels += args[:labels]
-          m.labels.delete :inbox  if source.archived?
-          m.labels.delete :unread if source.read?
-          m.labels.delete :unread if m.source_marked_read? # preserve read status if possible
-          m.labels.each { |l| LabelManager << l }
-          m.labels = old_m.labels + (m.labels - [:unread, :inbox]) if old_m
-          m.locations = old_m.locations + m.locations if old_m
-          HookManager.run "before-add-message", :message => m
-          yield :add, m, old_m, args[:progress] if block_given?
-          Index.sync_message m, true
-
-          ## We need to add or unhide the message when it either did not exist
-          ## before at all or when it was updated. We do *not* add/unhide when
-          ## the same message was found at a different location
-          if !old_m or not old_m.locations.member? m.location
-            UpdateManager.relay self, :added, m
-          end
-        when :delete
-          Index.each_message :location => [source.id, args[:info]] do |m|
-            m.locations.delete Location.new(source, args[:info])
-            yield :delete, m, [source,args[:info]], args[:progress] if block_given?
-            Index.sync_message m, false
-            #UpdateManager.relay self, :deleted, m
+    debug "trying to acquiring poll lock for: #{source}.."
+    if source.poll_lock.try_lock
+      debug "lock acquired for: #{source}."
+      begin
+        source.poll do |sym, args|
+          case sym
+          when :add
+            m = Message.build_from_source source, args[:info]
+            old_m = Index.build_message m.id
+            m.labels += args[:labels]
+            m.labels.delete :inbox  if source.archived?
+            m.labels.delete :unread if source.read?
+            m.labels.delete :unread if m.source_marked_read? # preserve read status if possible
+            m.labels.each { |l| LabelManager << l }
+            m.labels = old_m.labels + (m.labels - [:unread, :inbox]) if old_m
+            m.locations = old_m.locations + m.locations if old_m
+            HookManager.run "before-add-message", :message => m
+            yield :add, m, old_m, args[:progress] if block_given?
+            Index.sync_message m, true
+
+            ## We need to add or unhide the message when it either did not exist
+            ## before at all or when it was updated. We do *not* add/unhide when
+            ## the same message was found at a different location
+            if !old_m or not old_m.locations.member? m.location
+              UpdateManager.relay self, :added, m
+            end
+          when :delete
+            Index.each_message :location => [source.id, args[:info]] do |m|
+              m.locations.delete Location.new(source, args[:info])
+              yield :delete, m, [source,args[:info]], args[:progress] if block_given?
+              Index.sync_message m, false
+              #UpdateManager.relay self, :deleted, m
+            end
           end
         end
-      end
 
-      source.go_idle
-    rescue SourceError => e
-      warn "problem getting messages from #{source}: #{e.message}"
+      rescue SourceError => e
+        warn "problem getting messages from #{source}: #{e.message}"
+
+      ensure
+        source.go_idle
+        source.poll_lock.unlock
+      end
+    else
+      debug "source #{source} is already being polled."
     end
   end
 

data/lib/sup/source.rb

@@ -62,7 +62,7 @@ class Source
 
   bool_accessor :usual, :archived
   attr_reader :uri
-  attr_accessor :id
+  attr_accessor :id, :poll_lock
 
   def initialize uri, usual=true, archived=false, id=nil
     raise ArgumentError, "id must be an integer: #{id.inspect}" unless id.is_a? Fixnum if id
@@ -71,6 +71,8 @@ class Source
     @usual = usual
     @archived = archived
     @id = id
+
+    @poll_lock = Mutex.new
   end
 
   ## overwrite me if you have a disk incarnation (currently used only for sup-sync-back)

data/lib/sup/version.rb

@@ -1,3 +1,3 @@
 module Redwood
-  VERSION = "0.13.1"
+  VERSION = "0.13.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sup
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
   prerelease: 
   segments:
   - 0
   - 13
-  - 1
-  hash: -2513794677926756067
+  - 2
+  hash: 1496957733399950236
 platform: ruby
 authors:
 - William Morgan
@@ -46,7 +46,7 @@ cert_chain:
   ZUw2TWhhNApoRmMyeUFOQmo4dm9hWTVDNzRDZzJWcUV4dGNuU2F4VXRXOXdD
   NHc1aE9sZzBBVmZiMUpXemc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t
   Cg==
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xapian-full-alaveteli
@@ -60,7 +60,7 @@ dependencies:
         segments:
         - 1
         - 2
-        hash: -853541801780087623
+        hash: -3733181840957152875
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
         segments:
         - 1
         - 2
-        hash: -853541801780087623
+        hash: -3733181840957152875
 - !ruby/object:Gem::Dependency
   name: ncursesw-sup
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ dependencies:
         segments:
         - 1
         - 3
-        hash: 633068654591055268
+        hash: -876597745176914036
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.1
@@ -95,7 +95,7 @@ dependencies:
         - 1
         - 3
         - 1
-        hash: 2194476579308073519
+        hash: -640291375575489877
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ dependencies:
         segments:
         - 1
         - 3
-        hash: 633068654591055268
+        hash: -876597745176914036
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.1
@@ -117,7 +117,7 @@ dependencies:
         - 1
         - 3
         - 1
-        hash: 2194476579308073519
+        hash: -640291375575489877
 - !ruby/object:Gem::Dependency
   name: rmail
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
         segments:
         - 0
         - 17
-        hash: 447830368960240951
+        hash: -2258731216383999369
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -143,7 +143,7 @@ dependencies:
         segments:
         - 0
         - 17
-        hash: 447830368960240951
+        hash: -2258731216383999369
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ dependencies:
         prerelease: 
         segments:
         - 0
-        hash: -3209420716314174423
+        hash: -3965538710650358713
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -167,7 +167,7 @@ dependencies:
         prerelease: 
         segments:
         - 0
-        hash: -3209420716314174423
+        hash: -3965538710650358713
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +180,7 @@ dependencies:
         segments:
         - 1
         - 12
-        hash: -78987819028068823
+        hash: -2988883823466951243
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -193,7 +193,7 @@ dependencies:
         segments:
         - 1
         - 12
-        hash: -78987819028068823
+        hash: -2988883823466951243
 - !ruby/object:Gem::Dependency
   name: lockfile
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +205,7 @@ dependencies:
         prerelease: 
         segments:
         - 0
-        hash: -3209420716314174423
+        hash: -3965538710650358713
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -217,7 +217,7 @@ dependencies:
         prerelease: 
         segments:
         - 0
-        hash: -3209420716314174423
+        hash: -3965538710650358713
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -229,7 +229,7 @@ dependencies:
         prerelease: 
         segments:
         - 1
-        hash: 250434563374147666
+        hash: -1212563861242074830
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -241,7 +241,7 @@ dependencies:
         prerelease: 
         segments:
         - 1
-        hash: 250434563374147666
+        hash: -1212563861242074830
 - !ruby/object:Gem::Dependency
   name: locale
   requirement: !ruby/object:Gem::Requirement
@@ -254,7 +254,7 @@ dependencies:
         segments:
         - 2
         - 0
-        hash: 2973526120172593465
+        hash: 1592099054184333623
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -267,7 +267,7 @@ dependencies:
         segments:
         - 2
         - 0
-        hash: 2973526120172593465
+        hash: 1592099054184333623
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -280,7 +280,7 @@ dependencies:
         segments:
         - 0
         - 9
-        hash: 825354025702290061
+        hash: 2378526325938346664
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.1
@@ -289,7 +289,7 @@ dependencies:
         - 0
         - 9
         - 1
-        hash: -4434314476942640720
+        hash: 4569877028918522321
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -302,7 +302,7 @@ dependencies:
         segments:
         - 0
         - 9
-        hash: 825354025702290061
+        hash: 2378526325938346664
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.1
@@ -311,7 +311,7 @@ dependencies:
         - 0
         - 9
         - 1
-        hash: -4434314476942640720
+        hash: 4569877028918522321
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement