sup 0.14.1.1 → 0.15.0

data/lib/sup/sent.rb

@@ -27,7 +27,7 @@ class SentManager
   def write_sent_message date, from_email, &block
     ::Thread.new do
       debug "store the sent message (locking sent source..)"
-      @source.poll_lock.synchronize do
+      @source.synchronize do
         @source.store_message date, from_email, &block
       end
       PollManager.poll_from @source

data/lib/sup/source.rb

@@ -1,4 +1,5 @@
 require "sup/rfc2047"
+require "monitor"
 
 module Redwood
 
@@ -53,8 +54,8 @@ class Source
   ## Examples for you to look at: mbox.rb and maildir.rb.
 
   bool_accessor :usual, :archived
-  attr_reader :uri
-  attr_accessor :id, :poll_lock
+  attr_reader :uri, :usual
+  attr_accessor :id
 
   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
@@ -64,10 +65,10 @@ class Source
     @archived = archived
     @id = id
 
-    @poll_lock = Mutex.new
+    @poll_lock = Monitor.new
   end
 
-  ## overwrite me if you have a disk incarnation (currently used only for sup-sync-back)
+  ## overwrite me if you have a disk incarnation (currently used only for sup-sync-back-mbox)
   def file_path; nil end
 
   def to_s; @uri.to_s; end
@@ -81,6 +82,14 @@ class Source
   ## leaks (esp. file descriptors).
   def go_idle; end
 
+  ## Returns an array containing all the labels that are natively
+  ## supported by this source
+  def supported_labels?; [] end
+
+  ## Returns an array containing all the labels that are currently in
+  ## the location filename
+  def labels? info; [] end
+
   ## Yields values of the form [Symbol, Hash]
   ## add: info, labels, progress
   ## delete: info, progress
@@ -92,6 +101,25 @@ class Source
     true
   end
 
+  def synchronize &block
+    @poll_lock.synchronize &block
+  end
+
+  def try_lock
+    acquired = @poll_lock.try_enter
+    if acquired
+      debug "lock acquired for: #{self}"
+    else
+      debug "could not acquire lock for: #{self}"
+    end
+    acquired
+  end
+
+  def unlock
+    @poll_lock.exit
+    debug "lock released for: #{self}"
+  end
+
   ## utility method to read a raw email header from an IO stream and turn it
   ## into a hash of key-value pairs. minor special semantics for certain headers.
   ##

data/lib/sup/thread.rb

@@ -387,6 +387,12 @@ class ThreadSet
     m.refs.any? { |ref_id| @messages.member? ref_id }
   end
 
+  def delete_message message
+    el = @messages[message.id]
+    return unless el.message
+    el.message = nil
+  end
+
   ## the heart of the threading code
   def add_message message
     el = @messages[message.id]

data/lib/sup/util.rb

@@ -8,6 +8,7 @@ require 'set'
 require 'enumerator'
 require 'benchmark'
 require 'unicode'
+require 'fileutils'
 
 ## time for some monkeypatching!
 class Symbol
@@ -45,6 +46,17 @@ class Lockfile
   def touch_yourself; touch path end
 end
 
+class File
+  # platform safe file.link which attempts a copy if hard-linking fails
+  def self.safe_link src, dest
+    begin
+      File.link src, dest
+    rescue
+      FileUtils.copy src, dest
+    end
+  end
+end
+
 class Pathname
   def human_size
     s =
@@ -120,8 +132,6 @@ module RMail
     # 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

data/lib/sup/util/query.rb

@@ -3,10 +3,13 @@ module Redwood
     module Query
       class QueryDescriptionError < ArgumentError; end
 
-      def self.describe query
+      def self.describe(query, fallback = nil)
         d = query.description.force_encoding("UTF-8")
 
-        raise QueryDescriptionError.new(d) unless d.valid_encoding?
+        unless d.valid_encoding?
+          raise QueryDescriptionError.new(d) unless fallback
+          d = fallback
+        end
         return d
       end
     end

data/lib/sup/version.rb

@@ -1,3 +1,3 @@
 module Redwood
-  VERSION = "0.14.1.1"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sup
 version: !ruby/object:Gem::Version
-  version: 0.14.1.1
+  version: 0.15.0
   prerelease: 
   segments:
   - 0
-  - 14
-  - 1
-  - 1
-  hash: -295629968094096073
+  - 15
+  - 0
+  hash: 3778501713049268347
 platform: ruby
 authors:
 - William Morgan
@@ -18,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xapian-ruby
@@ -53,21 +52,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: rmail
+  name: rmail-sup
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +274,8 @@ executables:
 - sup-import-dump
 - sup-recover-sources
 - sup-sync
-- sup-sync-back
+- sup-sync-back-maildir
+- sup-sync-back-mbox
 - sup-tweak-labels
 - sup-psych-ify-config-files
 extensions: []
@@ -293,7 +293,8 @@ files:
 - bin/sup-import-dump
 - bin/sup-recover-sources
 - bin/sup-sync
-- bin/sup-sync-back
+- bin/sup-sync-back-maildir
+- bin/sup-sync-back-mbox
 - bin/sup-tweak-labels
 - bin/sup-psych-ify-config-files
 - lib/sup/hook.rb
@@ -364,9 +365,9 @@ homepage: http://supmua.org
 licenses:
 - GPL-2
 post_install_message: ! "SUP: If you are upgrading Sup from before version 0.14.0:
-  Please\n     run `sup-psych-ify-config-files` to migrate from 0.13 to 0.14.\n\n
-  \    Check https://github.com/sup-heliotrope/sup/wiki/Migration-0.13-to-0.14\n     for
-  more detailed and up-to-date instructions.\n"
+  Please\n     run `sup-psych-ify-config-files` to migrate from 0.13.\n\n     Check
+  https://github.com/sup-heliotrope/sup/wiki/Migration-0.13-to-0.14\n     for more
+  detailed and up-to-date instructions.\n"
 rdoc_options: []
 require_paths:
 - lib