sup 0.8.1 → 0.9

data/lib/sup/hook.rb.LOCAL.8681.rb

@@ -0,0 +1,142 @@
+module Redwood
+
+class HookManager
+  class HookContext
+    def initialize name
+      @__say_id = nil
+      @__name = name
+      @__cache = {}
+    end
+
+    def say s
+      if BufferManager.instantiated?
+        @__say_id = BufferManager.say s, @__say_id
+        BufferManager.draw_screen
+      else
+        log s
+      end
+    end
+
+    def log s
+      info "hook[#@__name]: #{s}"
+    end
+
+    def ask_yes_or_no q
+      if BufferManager.instantiated?
+        BufferManager.ask_yes_or_no q
+      else
+        print q
+        gets.chomp.downcase == 'y'
+      end
+    end
+
+    def get tag
+      HookManager.tags[tag]
+    end
+
+    def set tag, value
+      HookManager.tags[tag] = value
+    end
+
+    def __run __hook, __filename, __locals
+      __binding = binding
+      __lprocs, __lvars = __locals.partition { |k, v| v.is_a?(Proc) }
+      eval __lvars.map { |k, v| "#{k} = __locals[#{k.inspect}];" }.join, __binding
+      ## we also support closures for delays evaluation. unfortunately
+      ## we have to do this via method calls, so you don't get all the
+      ## semantics of a regular variable. not ideal.
+      __lprocs.each do |k, v|
+        self.class.instance_eval do
+          define_method k do
+            @__cache[k] ||= v.call
+          end
+        end
+      end
+      ret = eval __hook, __binding, __filename
+      BufferManager.clear @__say_id if @__say_id
+      @__cache = {}
+      ret
+    end
+  end
+
+  include Singleton
+
+  def initialize dir
+    @dir = dir
+    @hooks = {}
+    @descs = {}
+    @contexts = {}
+    @tags = {}
+
+    Dir.mkdir dir unless File.exists? dir
+  end
+
+  attr_reader :tags
+
+  def run name, locals={}
+    hook = hook_for(name) or return
+    context = @contexts[hook] ||= HookContext.new(name)
+
+    result = nil
+    begin
+      result = context.__run hook, fn_for(name), locals
+    rescue Exception => e
+      log "error running hook: #{e.message}"
+      log e.backtrace.join("\n")
+      @hooks[name] = nil # disable it
+      BufferManager.flash "Error running hook: #{e.message}" if BufferManager.instantiated?
+    end
+    result
+  end
+
+  def register name, desc
+    @descs[name] = desc
+  end
+
+  def print_hooks f=$stdout
+puts <<EOS
+Have #{@descs.size} registered hooks:
+
+EOS
+
+    @descs.sort.each do |name, desc|
+      f.puts <<EOS
+#{name}
+#{"-" * name.length}
+File: #{fn_for name}
+#{desc}
+EOS
+    end
+  end
+
+  def enabled? name; !hook_for(name).nil? end
+
+  def clear; @hooks.clear; end
+
+private
+
+  def hook_for name
+    unless @hooks.member? name
+      @hooks[name] = begin
+        returning IO.read(fn_for(name)) do
+          debug "read '#{name}' from #{fn_for(name)}"
+        end
+      rescue SystemCallError => e
+        #debug "disabled hook for '#{name}': #{e.message}"
+        nil
+      end
+    end
+
+    @hooks[name]
+  end
+
+  def fn_for name
+    File.join @dir, "#{name}.rb"
+  end
+
+  def log m
+    info("hook: " + m)
+  end
+end
+
+end

data/lib/sup/hook.rb.REMOTE.8625.rb

@@ -0,0 +1,145 @@
+module Redwood
+
+class HookManager
+  class HookContext
+    def initialize name
+      @__say_id = nil
+      @__name = name
+      @__locals = {}
+    end
+
+    attr_writer :__locals
+    def method_missing m, *a
+      case @__locals[m]
+      when Proc
+        @__locals[m] = @__locals[m].call(*a) # only call the proc once
+      when nil
+        super
+      else
+        @__locals[m]
+      end
+    end
+
+    def say s
+      if BufferManager.instantiated?
+        @__say_id = BufferManager.say s, @__say_id
+        BufferManager.draw_screen
+      else
+        log s
+      end
+    end
+
+    def log s
+      Redwood::log "hook[#@__name]: #{s}"
+    end
+
+    def ask_yes_or_no q
+      if BufferManager.instantiated?
+        BufferManager.ask_yes_or_no q
+      else
+        print q
+        gets.chomp.downcase == 'y'
+      end
+    end
+
+    def get tag
+      HookManager.tags[tag]
+    end
+
+    def set tag, value
+      HookManager.tags[tag] = value
+    end
+
+    def __binding 
+      binding
+    end
+
+    def __cleanup
+      BufferManager.clear @__say_id if @__say_id
+    end
+  end
+
+  include Singleton
+
+  def initialize dir
+    @dir = dir
+    @hooks = {}
+    @descs = {}
+    @contexts = {}
+    @tags = {}
+
+    Dir.mkdir dir unless File.exists? dir
+
+    self.class.i_am_the_instance self
+  end
+
+  attr_reader :tags
+
+  def run name, locals={}
+    hook = hook_for(name) or return
+    context = @contexts[hook] ||= HookContext.new(name)
+    context.__locals = locals
+
+    result = nil
+    begin
+      result = context.instance_eval @hooks[name], fn_for(name)
+    rescue Exception => e
+      log "error running hook: #{e.message}"
+      log e.backtrace.join("\n")
+      @hooks[name] = nil # disable it
+      BufferManager.flash "Error running hook: #{e.message}" if BufferManager.instantiated?
+    end
+    context.__cleanup
+    result
+  end
+
+  def register name, desc
+    @descs[name] = desc
+  end
+
+  def print_hooks f=$stdout
+puts <<EOS
+Have #{@descs.size} registered hooks:
+
+EOS
+
+    @descs.sort.each do |name, desc|
+      f.puts <<EOS
+#{name}
+#{"-" * name.length}
+File: #{fn_for name}
+#{desc}
+EOS
+    end
+  end
+
+  def enabled? name; !hook_for(name).nil? end
+
+private
+
+  def hook_for name
+    unless @hooks.member? name
+      @hooks[name] =
+        begin
+          returning IO.read(fn_for(name)) do
+            log "read '#{name}' from #{fn_for(name)}"
+          end
+        rescue SystemCallError => e
+          #log "disabled hook for '#{name}': #{e.message}"
+          nil
+        end
+    end
+
+    @hooks[name]
+  end
+
+  def fn_for name
+    File.join @dir, "#{name}.rb"
+  end
+
+  def log m
+    Redwood::log("hook: " + m)
+  end
+end
+
+end

data/lib/sup/hook.rb.REMOTE.8681.rb

@@ -0,0 +1,145 @@
+module Redwood
+
+class HookManager
+  class HookContext
+    def initialize name
+      @__say_id = nil
+      @__name = name
+      @__locals = {}
+    end
+
+    attr_writer :__locals
+    def method_missing m, *a
+      case @__locals[m]
+      when Proc
+        @__locals[m] = @__locals[m].call(*a) # only call the proc once
+      when nil
+        super
+      else
+        @__locals[m]
+      end
+    end
+
+    def say s
+      if BufferManager.instantiated?
+        @__say_id = BufferManager.say s, @__say_id
+        BufferManager.draw_screen
+      else
+        log s
+      end
+    end
+
+    def log s
+      Redwood::log "hook[#@__name]: #{s}"
+    end
+
+    def ask_yes_or_no q
+      if BufferManager.instantiated?
+        BufferManager.ask_yes_or_no q
+      else
+        print q
+        gets.chomp.downcase == 'y'
+      end
+    end
+
+    def get tag
+      HookManager.tags[tag]
+    end
+
+    def set tag, value
+      HookManager.tags[tag] = value
+    end
+
+    def __binding 
+      binding
+    end
+
+    def __cleanup
+      BufferManager.clear @__say_id if @__say_id
+    end
+  end
+
+  include Singleton
+
+  def initialize dir
+    @dir = dir
+    @hooks = {}
+    @descs = {}
+    @contexts = {}
+    @tags = {}
+
+    Dir.mkdir dir unless File.exists? dir
+
+    self.class.i_am_the_instance self
+  end
+
+  attr_reader :tags
+
+  def run name, locals={}
+    hook = hook_for(name) or return
+    context = @contexts[hook] ||= HookContext.new(name)
+    context.__locals = locals
+
+    result = nil
+    begin
+      result = context.instance_eval @hooks[name], fn_for(name)
+    rescue Exception => e
+      log "error running hook: #{e.message}"
+      log e.backtrace.join("\n")
+      @hooks[name] = nil # disable it
+      BufferManager.flash "Error running hook: #{e.message}" if BufferManager.instantiated?
+    end
+    context.__cleanup
+    result
+  end
+
+  def register name, desc
+    @descs[name] = desc
+  end
+
+  def print_hooks f=$stdout
+puts <<EOS
+Have #{@descs.size} registered hooks:
+
+EOS
+
+    @descs.sort.each do |name, desc|
+      f.puts <<EOS
+#{name}
+#{"-" * name.length}
+File: #{fn_for name}
+#{desc}
+EOS
+    end
+  end
+
+  def enabled? name; !hook_for(name).nil? end
+
+private
+
+  def hook_for name
+    unless @hooks.member? name
+      @hooks[name] =
+        begin
+          returning IO.read(fn_for(name)) do
+            log "read '#{name}' from #{fn_for(name)}"
+          end
+        rescue SystemCallError => e
+          #log "disabled hook for '#{name}': #{e.message}"
+          nil
+        end
+    end
+
+    @hooks[name]
+  end
+
+  def fn_for name
+    File.join @dir, "#{name}.rb"
+  end
+
+  def log m
+    Redwood::log("hook: " + m)
+  end
+end
+
+end

data/lib/sup/imap.rb

@@ -4,6 +4,7 @@ require 'stringio'
 require 'time'
 require 'rmail'
 require 'cgi'
+require 'set'
 
 ## TODO: remove synchronized method protector calls; use a Monitor instead
 ## (ruby's reentrant mutex)
@@ -47,6 +48,7 @@ require 'cgi'
 module Redwood
 
 class IMAP < Source
+  include SerializeLabelsNicely
   SCAN_INTERVAL = 60 # seconds
 
   ## upon these errors we'll try to rereconnect a few times
@@ -69,7 +71,7 @@ class IMAP < Source
     @imap_state = {}
     @ids = []
     @last_scan = nil
-    @labels = ((labels || []) - LabelManager::RESERVED_LABELS).uniq.freeze
+    @labels = Set.new((labels || []) - LabelManager::RESERVED_LABELS)
     @say_id = nil
     @mutex = Mutex.new
   end
@@ -111,6 +113,14 @@ class IMAP < Source
   end
   synchronized :raw_header
 
+  def store_message date, from_email, &block
+    message = StringIO.new
+    yield message
+    message.string.gsub! /\n/, "\r\n"
+
+    safely { @imap.append mailbox, message.string, [:Seen], Time.now }
+  end
+
   def raw_message id
     unsynchronized_scan_mailbox
     get_imap_fields(id, 'RFC822').first.gsub(/\r\n/, "\n")
@@ -151,13 +161,13 @@ class IMAP < Source
     return if last_id == @ids.length
 
     range = (@ids.length + 1) .. last_id
-    Redwood::log "fetching IMAP headers #{range}"
+    debug "fetching IMAP headers #{range}"
     fetch(range, ['RFC822.SIZE', 'INTERNALDATE', 'FLAGS']).each do |v|
       id = make_id v
       @ids << id
       @imap_state[id] = { :id => v.seqno, :flags => v.attr["FLAGS"] }
     end
-    Redwood::log "done fetching IMAP headers"
+    debug "done fetching IMAP headers"
   end
   synchronized :scan_mailbox
 
@@ -216,7 +226,7 @@ private
     if good_results.empty?
       raise FatalSourceError, "no IMAP response for #{ids} containing all fields #{fields.join(', ')} (got #{results.size} results)"
     elsif good_results.size < results.size
-      Redwood::log "Your IMAP server sucks. It sent #{results.size} results for a request for #{good_results.size} messages. What are you using, Binc?"
+      warn "Your IMAP server sucks. It sent #{results.size} results for a request for #{good_results.size} messages. What are you using, Binc?"
     end
 
     good_results
@@ -244,12 +254,12 @@ private
           raise Net::IMAP::NoResponseError unless @imap.capability().member? "AUTH=CRAM-MD5"
           @imap.authenticate 'CRAM-MD5', @username, @password
         rescue Net::IMAP::BadResponseError, Net::IMAP::NoResponseError => e
-          Redwood::log "CRAM-MD5 authentication failed: #{e.class}. Trying LOGIN auth..."
+          debug "CRAM-MD5 authentication failed: #{e.class}. Trying LOGIN auth..."
           begin
             raise Net::IMAP::NoResponseError unless @imap.capability().member? "AUTH=LOGIN"
             @imap.authenticate 'LOGIN', @username, @password
           rescue Net::IMAP::BadResponseError, Net::IMAP::NoResponseError => e
-            Redwood::log "LOGIN authentication failed: #{e.class}. Trying plain-text LOGIN..."
+            debug "LOGIN authentication failed: #{e.class}. Trying plain-text LOGIN..."
             @imap.login @username, @password
           end
         end
@@ -266,7 +276,7 @@ private
 
   def say s
     @say_id = BufferManager.say s, @say_id if BufferManager.instantiated?
-    Redwood::log s
+    info s
   end
 
   def shutup
@@ -323,7 +333,7 @@ private
       rescue *RECOVERABLE_ERRORS => e
         if (retries += 1) <= 3
           @imap = nil
-          Redwood::log "got #{e.class.name}: #{e.message.inspect}"
+          warn "got #{e.class.name}: #{e.message.inspect}"
           sleep 2
           retry
         end