sup 0.9.1 → 0.10

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sup
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: "0.10"
 platform: ruby
 authors: 
 - William Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 10:02:24 -05:00
+date: 2010-01-24 11:59:28 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,6 +123,7 @@ executables:
 - sup-sync
 - sup-sync-back
 - sup-tweak-labels
+- sup-convert-ferret-index
 extensions: []
 
 extra_rdoc_files: []
@@ -141,17 +142,15 @@ files:
 - bin/sup-sync
 - bin/sup-sync-back
 - bin/sup-tweak-labels
+- bin/sup-convert-ferret-index
 - lib/sup.rb
 - lib/ncurses.rb
-- lib/sup/hook.rb.REMOTE.8625.rb
 - lib/sup/poll.rb
-- lib/sup/hook.rb.BASE.8625.rb
 - lib/sup/source.rb
 - lib/sup/crypto.rb
 - lib/sup/horizontal-selector.rb
 - lib/sup/mode.rb
 - lib/sup/interactive-lock.rb
-- lib/sup/hook.rb.BACKUP.8681.rb
 - lib/sup/account.rb
 - lib/sup/imap.rb
 - lib/sup/maildir.rb
@@ -160,17 +159,14 @@ files:
 - lib/sup/label.rb
 - lib/sup/index.rb
 - lib/sup/keymap.rb
-- lib/sup/hook.rb.LOCAL.8681.rb
 - lib/sup/rfc2047.rb
 - lib/sup/tagger.rb
 - lib/sup/util.rb
 - lib/sup/textfield.rb
 - lib/sup/xapian_index.rb
-- lib/sup/hook.rb.BACKUP.8625.rb
 - lib/sup/sent.rb
 - lib/sup/undo.rb
 - lib/sup/mbox.rb
-- lib/sup/hook.rb.LOCAL.8625.rb
 - lib/sup/person.rb
 - lib/sup/ferret_index.rb
 - lib/sup/thread.rb
@@ -180,8 +176,6 @@ files:
 - lib/sup/colormap.rb
 - lib/sup/buffer.rb
 - lib/sup/logger.rb
-- lib/sup/hook.rb.REMOTE.8681.rb
-- lib/sup/hook.rb.BASE.8681.rb
 - lib/sup/draft.rb
 - lib/sup/modes/label-search-results-mode.rb
 - lib/sup/modes/completion-mode.rb

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

@@ -1,158 +0,0 @@
-module Redwood
-
-class HookManager
-  class HookContext
-    def initialize name
-      @__say_id = nil
-      @__name = name
-<<<<<<< HEAD:lib/sup/hook.rb
-      @__cache = {}
-=======
-      @__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
->>>>>>> custom-search-hook:lib/sup/hook.rb
-    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.BACKUP.8681.rb

@@ -1,158 +0,0 @@
-module Redwood
-
-class HookManager
-  class HookContext
-    def initialize name
-      @__say_id = nil
-      @__name = name
-<<<<<<< HEAD:lib/sup/hook.rb
-      @__cache = {}
-=======
-      @__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
->>>>>>> custom-search-hook:lib/sup/hook.rb
-    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.BASE.8625.rb

@@ -1,155 +0,0 @@
-module Redwood
-
-class HookManager
-  ## there's probably a better way to do this, but to evaluate a hook
-  ## with a bunch of pre-set "local variables" i define a function
-  ## per variable and then instance_evaluate the code.
-  ##
-  ## how does rails do it, when you pass :locals into a partial?
-  ##
-  ## i don't bother providing setters, since i'm pretty sure the
-  ## charade will fall apart pretty quickly with respect to scoping.
-  ## "fail-fast", we'll call it.
-  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