sup 0.13.0 → 0.13.1

data/lib/sup/logger.rb

@@ -1,4 +1,4 @@
-require "sup"
+require "sup/util"
 require 'stringio'
 require 'thread'
 

data/lib/sup/logger/singleton.rb

@@ -0,0 +1,10 @@
+# TODO: this is ugly. It's better to have a application singleton passed
+# down to lower level components instead of including logging methods in
+# class `Object'
+#
+# For now this is what we have to do.
+require "sup/logger"
+Redwood::Logger.init.add_sink $stderr
+class Object
+  include Redwood::LogsStuff
+end

data/lib/sup/{message-chunks.rb → message_chunks.rb}

@@ -130,7 +130,7 @@ EOS
       end
     end
 
-    def color; :none end
+    def color; :text_color end
     def patina_color; :attachment_color end
     def patina_text
       if expandable?
@@ -191,7 +191,7 @@ EOS
     def quotable?; true end
     def expandable?; false end
     def viewable?; false end
-    def color; :none end
+    def color; :text_color end
   end
 
   class Quote

data/lib/sup/modes/{completion-mode.rb → completion_mode.rb}

@@ -38,11 +38,11 @@ private
           suffix = s[(@prefix_len + 1) .. -1]
           char = s[@prefix_len].chr
 
-          @lines.last += [[:none, sprintf("%#{max_length - suffix.length - 1}s", prefix)],
+          @lines.last += [[:text_color, sprintf("%#{max_length - suffix.length - 1}s", prefix)],
                           [:completion_character_color, char],
-                          [:none, suffix + INTERSTITIAL]]
+                          [:text_color, suffix + INTERSTITIAL]]
         else
-          @lines.last += [[:none, sprintf("%#{max_length}s#{INTERSTITIAL}", s)]]
+          @lines.last += [[:text_color, sprintf("%#{max_length}s#{INTERSTITIAL}", s)]]
         end
       else
         @lines << "" if i % num_per == 0

data/lib/sup/modes/{console-mode.rb → console_mode.rb}

@@ -1,10 +1,13 @@
 require 'pp'
 
+require "sup/service/label_service"
+
 module Redwood
 
 class Console
   def initialize mode
     @mode = mode
+    @label_service = LabelService.new
   end
 
   def query(query)
@@ -12,19 +15,27 @@ class Console
   end
 
   def add_labels(query, *labels)
-    query(query).each { |m| m.labels += labels; m.save Index }
+    count = @label_service.add_labels(query, *labels)
+    print_buffer_dirty_msg count
   end
 
   def remove_labels(query, *labels)
-    query(query).each { |m| m.labels -= labels; m.save Index }
+    count = @label_service.remove_labels(query, *labels)
+    print_buffer_dirty_msg count
+  end
+
+  def print_buffer_dirty_msg msg_count
+    puts "Scanned #{msg_count} messages."
+    puts "You might want to refresh open buffers with `@` key."
   end
+  private :print_buffer_dirty_msg
 
   def xapian; Index.instance.instance_variable_get :@xapian; end
 
   def loglevel; Redwood::Logger.level; end
   def set_loglevel(level); Redwood::Logger.level = level; end
 
-  def special_methods; methods - Object.methods end
+  def special_methods; public_methods - Object.methods end
 
   def puts x; @mode << "#{x.to_s.rstrip}\n" end
   def p x; puts x.inspect end

data/lib/sup/modes/{edit-message-mode.rb → edit_message_mode.rb}

@@ -131,13 +131,18 @@ EOS
         HorizontalSelector.new "Account:", AccountManager.user_emails + [nil], user_emails_copy + ["Customized"]
 
       if @header["From"] =~ /<?(\S+@(\S+?))>?$/
-        @account_selector.set_to $1
-        @account_user = ""
+        # TODO: this is ugly. might implement an AccountSelector and handle
+        # special cases more transparently.
+        account_from = @account_selector.can_set_to?($1) ? $1 : nil
+        @account_selector.set_to account_from
       else
         @account_selector.set_to nil
-        @account_user = @header["From"]
       end
 
+      # A single source of truth might better than duplicating this in both
+      # @account_user and @account_selector.
+      @account_user = @header["From"]
+
       add_selector @account_selector
     end
 

data/lib/sup/modes/{line-cursor-mode.rb → line_cursor_mode.rb}

@@ -47,9 +47,9 @@ protected
 
   def draw_line ln, opts={}
     if ln == @curpos
-      super ln, :highlight => true, :debug => opts[:debug]
+      super ln, :highlight => true, :debug => opts[:debug], :color => :text_color
     else
-      super
+      super ln, :color => :text_color
     end
   end
 

data/lib/sup/modes/{scroll-mode.rb → scroll_mode.rb}

@@ -43,12 +43,12 @@ class ScrollMode < Mode
 
   def draw
     ensure_mode_validity
-    (@topline ... @botline).each { |ln| draw_line ln }
+    (@topline ... @botline).each { |ln| draw_line ln, :color => :text_color }
     ((@botline - @topline) ... buffer.content_height).each do |ln|
       if @twiddles
         buffer.write ln, 0, "~", :color => :twiddle_color
       else
-        buffer.write ln, 0, ""
+        buffer.write ln, 0, "", :color => :text_color
       end
     end
     @status = "lines #{@topline + 1}:#{@botline}/#{lines}"
@@ -208,7 +208,7 @@ protected
       # return
   end
 
-  def matching_text_array s, regex, oldcolor=:none
+  def matching_text_array s, regex, oldcolor=:text_color
     s.split(regex).map do |text|
       next if text.empty?
       if text =~ regex
@@ -244,7 +244,7 @@ protected
   end
 
   def draw_line_from_string ln, s, opts
-    buffer.write ln - @topline, 0, s[@leftcol .. -1], :highlight => opts[:highlight]
+    buffer.write ln - @topline, 0, s[@leftcol .. -1], :highlight => opts[:highlight], :color => opts[:color]
   end
 end
 

data/lib/sup/modes/{thread-index-mode.rb → thread_index_mode.rb}

@@ -110,7 +110,7 @@ EOS
       num = t.size
       message = "Loading #{num.pluralize 'message body'}..."
       BufferManager.say(message) do |sid|
-        t.each_with_index do |(m, *o), i|
+        t.each_with_index do |(m, *_), i|
           next unless m
           BufferManager.say "#{message} (#{i}/#{num})", sid if t.size > 1
           m.load_from_source!
@@ -247,7 +247,7 @@ EOS
 
   def edit_message
     return unless(t = cursor_thread)
-    message, *crap = t.find { |m, *o| m.has_label? :draft }
+    message, *_ = t.find { |m, *o| m.has_label? :draft }
     if message
       mode = ResumeMode.new message
       BufferManager.spawn "Edit message", mode
@@ -258,7 +258,6 @@ EOS
 
   ## returns an undo lambda
   def actually_toggle_starred t
-    pos = curpos
     if t.has_label? :starred # if ANY message has a star
       t.remove_label :starred # remove from all
       UpdateManager.relay self, :unstarred, t.first
@@ -877,8 +876,9 @@ protected
       from << [(newness ? :index_new_color : (starred ? :index_starred_color : :index_old_color)), abbrev]
     end
 
-    dp = t.direct_participants.any? { |p| AccountManager.is_account? p }
-    p = dp || t.participants.any? { |p| AccountManager.is_account? p }
+    is_me = AccountManager.method(:is_account?)
+    directly_participated = t.direct_participants.any?(&is_me)
+    participated = directly_participated || t.participants.any?(&is_me)
 
     subj_color =
       if t.has_label?(:draft)
@@ -908,7 +908,7 @@ protected
       [
       [:size_widget_color, size_widget_text],
       [:to_me_color, t.labels.member?(:attachment) ? "@" : " "],
-      [:to_me_color, dp ? ">" : (p ? '+' : " ")],
+      [:to_me_color, directly_participated ? ">" : (participated ? '+' : " ")],
     ] +
       (t.labels - @hidden_labels).sort_by {|x| x.to_s}.map {
             |label| [Colormap.sym_is_defined("label_#{label}_color".to_sym) || :label_color, "#{label} "]

data/lib/sup/poll.rb

@@ -22,6 +22,8 @@ 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_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
    from_and_subj_inbox: an array of (from email address, subject) pairs for
@@ -43,22 +45,35 @@ EOS
 
   def poll_with_sources
     @mode ||= PollMode.new
-    HookManager.run "before-poll"
 
-    BufferManager.flash "Polling for new messages..."
+    if HookManager.enabled? "before-poll"
+      HookManager.run("before-poll")
+    else
+      BufferManager.flash "Polling for new messages..."
+    end
+
     num, numi, from_and_subj, from_and_subj_inbox, loaded_labels = @mode.poll
     clear_running_totals if @should_clear_running_totals
     @running_totals[:num] += num
     @running_totals[:numi] += numi
     @running_totals[:loaded_labels] += loaded_labels || []
-    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(', ')}"
+   
+    
+    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, 
+                    :num_inbox_total_unread => lambda { Index.num_results_for :labels => [:inbox, :unread] } }
+
+      HookManager.run("after-poll", hook_args) 
     else
-      BufferManager.flash "No new messages."
+      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(', ')}"
+      else
+        BufferManager.flash "No new messages."
+      end
     end
 
-    HookManager.run "after-poll", :num => num, :num_inbox => numi, :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] }
-
   end
 
   def poll

data/lib/sup/service/label_service.rb

@@ -0,0 +1,45 @@
+require "sup/index"
+
+module Redwood
+  # Provides label tweaking service to the user.
+  # Working as the backend of ConsoleMode.
+  #
+  # Should become the backend of bin/sup-tweak-labels in the future.
+  class LabelService
+    # @param index [Redwood::Index]
+    def initialize index=Index.instance
+      @index = index
+    end
+
+    def add_labels query, *labels
+      run_on_each_message(query) do |m|
+        labels.each {|l| m.add_label l }
+      end
+    end
+
+    def remove_labels query, *labels
+      run_on_each_message(query) do |m|
+        labels.each {|l| m.remove_label l }
+      end
+    end
+
+
+    private
+    def run_on_each_message query, &operation
+      count = 0
+
+      find_messages(query).each do |m|
+        operation.call(m)
+        @index.update_message_state m
+        count += 1
+      end
+
+      @index.save_index
+      count
+    end
+
+    def find_messages query
+      @index.find_messages(query)
+    end
+  end
+end

data/lib/sup/util/path.rb

@@ -0,0 +1,9 @@
+module Redwood
+  module Util
+    module Path
+      def self.expand(path)
+        ::File.expand_path(path)
+      end
+    end
+  end
+end

data/lib/sup/util/uri.rb

@@ -0,0 +1,15 @@
+require "uri"
+
+require "sup/util/path"
+
+module Redwood
+  module Util
+    module Uri
+      def self.build(components)
+        components = components.dup
+        components[:path] = Path.expand(components[:path])
+        ::URI::Generic.build(components)
+      end
+    end
+  end
+end

data/lib/sup/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sup
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
   prerelease: 
   segments:
   - 0
   - 13
-  - 0
-  hash: -4492560732051236832
+  - 1
+  hash: -2513794677926756067
 platform: ruby
 authors:
 - William Morgan
@@ -46,7 +46,7 @@ cert_chain:
   ZUw2TWhhNApoRmMyeUFOQmo4dm9hWTVDNzRDZzJWcUV4dGNuU2F4VXRXOXdD
   NHc1aE9sZzBBVmZiMUpXemc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t
   Cg==
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xapian-full-alaveteli
@@ -56,10 +56,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+        prerelease: 
         segments:
         - 1
         - 2
-        hash: -3470814721440028832
+        hash: -853541801780087623
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -68,10 +69,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
+        prerelease: 
         segments:
         - 1
         - 2
-        hash: -3470814721440028832
+        hash: -853541801780087623
 - !ruby/object:Gem::Dependency
   name: ncursesw-sup
   requirement: !ruby/object:Gem::Requirement
@@ -80,18 +82,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+        prerelease: 
         segments:
         - 1
         - 3
-        hash: -3847811635784656183
+        hash: 633068654591055268
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.1
+        prerelease: 
         segments:
         - 1
         - 3
         - 1
-        hash: -3904231600277470242
+        hash: 2194476579308073519
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -100,18 +104,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+        prerelease: 
         segments:
         - 1
         - 3
-        hash: -3847811635784656183
+        hash: 633068654591055268
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.1
+        prerelease: 
         segments:
         - 1
         - 3
         - 1
-        hash: -3904231600277470242
+        hash: 2194476579308073519
 - !ruby/object:Gem::Dependency
   name: rmail
   requirement: !ruby/object:Gem::Requirement
@@ -120,10 +126,11 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.17'
+        prerelease: 
         segments:
         - 0
         - 17
-        hash: -718457563752098801
+        hash: 447830368960240951
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -132,32 +139,35 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.17'
+        prerelease: 
         segments:
         - 0
         - 17
-        hash: -718457563752098801
+        hash: 447830368960240951
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
+    none: true
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        prerelease: 
         segments:
         - 0
-        hash: 3761451823671182045
+        hash: -3209420716314174423
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    none: true
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        prerelease: 
         segments:
         - 0
-        hash: 3761451823671182045
+        hash: -3209420716314174423
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -166,10 +176,11 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.12'
+        prerelease: 
         segments:
         - 1
         - 12
-        hash: -4287820016106514407
+        hash: -78987819028068823
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -178,32 +189,35 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.12'
+        prerelease: 
         segments:
         - 1
         - 12
-        hash: -4287820016106514407
+        hash: -78987819028068823
 - !ruby/object:Gem::Dependency
   name: lockfile
   requirement: !ruby/object:Gem::Requirement
-    none: false
+    none: true
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        prerelease: 
         segments:
         - 0
-        hash: 3761451823671182045
+        hash: -3209420716314174423
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    none: true
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        prerelease: 
         segments:
         - 0
-        hash: 3761451823671182045
+        hash: -3209420716314174423
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -212,9 +226,10 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1'
+        prerelease: 
         segments:
         - 1
-        hash: -1625349299735885178
+        hash: 250434563374147666
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -223,31 +238,80 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1'
+        prerelease: 
         segments:
         - 1
-        hash: -1625349299735885178
+        hash: 250434563374147666
+- !ruby/object:Gem::Dependency
+  name: locale
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+        prerelease: 
+        segments:
+        - 2
+        - 0
+        hash: 2973526120172593465
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+        prerelease: 
+        segments:
+        - 2
+        - 0
+        hash: 2973526120172593465
 - !ruby/object:Gem::Dependency
-  name: gettext
+  name: chronic
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+        prerelease: 
+        segments:
+        - 0
+        - 9
+        hash: 825354025702290061
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
+        prerelease: 
         segments:
         - 0
-        hash: 3761451823671182045
+        - 9
+        - 1
+        hash: -4434314476942640720
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+        prerelease: 
+        segments:
+        - 0
+        - 9
+        hash: 825354025702290061
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
+        prerelease: 
         segments:
         - 0
-        hash: 3761451823671182045
+        - 9
+        - 1
+        hash: -4434314476942640720
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -256,10 +320,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-        segments:
-        - 1
-        - 3
-        hash: -3847811635784656183
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -268,10 +328,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-        segments:
-        - 1
-        - 3
-        hash: -3847811635784656183
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -280,9 +336,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-        segments:
-        - 0
-        hash: 3761451823671182045
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -291,9 +344,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-        segments:
-        - 0
-        hash: 3761451823671182045
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: ! "      Sup is a console-based email client for people with a lot of
   email.\n\n      * GMail-like thread-centered archiving, tagging and muting\n      *
   Handling mail from multiple mbox and Maildir sources\n      * Blazing fast full-text
@@ -329,34 +411,37 @@ files:
 - bin/sup-sync-back
 - bin/sup-tweak-labels
 - lib/sup/hook.rb
-- lib/sup/modes/forward-mode.rb
-- lib/sup/modes/person-search-results-mode.rb
-- lib/sup/modes/edit-message-mode.rb
-- lib/sup/modes/line-cursor-mode.rb
-- lib/sup/modes/log-mode.rb
-- lib/sup/modes/contact-list-mode.rb
-- lib/sup/modes/search-list-mode.rb
-- lib/sup/modes/reply-mode.rb
-- lib/sup/modes/label-list-mode.rb
-- lib/sup/modes/label-search-results-mode.rb
-- lib/sup/modes/file-browser-mode.rb
-- lib/sup/modes/help-mode.rb
-- lib/sup/modes/resume-mode.rb
-- lib/sup/modes/thread-view-mode.rb
-- lib/sup/modes/compose-mode.rb
-- lib/sup/modes/text-mode.rb
-- lib/sup/modes/thread-index-mode.rb
-- lib/sup/modes/console-mode.rb
-- lib/sup/modes/search-results-mode.rb
-- lib/sup/modes/inbox-mode.rb
-- lib/sup/modes/edit-message-async-mode.rb
-- lib/sup/modes/completion-mode.rb
-- lib/sup/modes/scroll-mode.rb
-- lib/sup/modes/poll-mode.rb
-- lib/sup/modes/buffer-list-mode.rb
+- lib/sup/util/uri.rb
+- lib/sup/util/path.rb
+- lib/sup/horizontal_selector.rb
+- lib/sup/modes/line_cursor_mode.rb
+- lib/sup/modes/label_list_mode.rb
+- lib/sup/modes/completion_mode.rb
+- lib/sup/modes/compose_mode.rb
+- lib/sup/modes/search_results_mode.rb
+- lib/sup/modes/thread_view_mode.rb
+- lib/sup/modes/thread_index_mode.rb
+- lib/sup/modes/console_mode.rb
+- lib/sup/modes/resume_mode.rb
+- lib/sup/modes/person_search_results_mode.rb
+- lib/sup/modes/buffer_list_mode.rb
+- lib/sup/modes/edit_message_mode.rb
+- lib/sup/modes/log_mode.rb
+- lib/sup/modes/poll_mode.rb
+- lib/sup/modes/help_mode.rb
+- lib/sup/modes/label_search_results_mode.rb
+- lib/sup/modes/search_list_mode.rb
+- lib/sup/modes/scroll_mode.rb
+- lib/sup/modes/reply_mode.rb
+- lib/sup/modes/text_mode.rb
+- lib/sup/modes/forward_mode.rb
+- lib/sup/modes/inbox_mode.rb
+- lib/sup/modes/file_browser_mode.rb
+- lib/sup/modes/contact_list_mode.rb
+- lib/sup/modes/edit_message_async_mode.rb
+- lib/sup/logger/singleton.rb
 - lib/sup/mbox.rb
 - lib/sup/undo.rb
-- lib/sup/message-chunks.rb
 - lib/sup/tagger.rb
 - lib/sup/message.rb
 - lib/sup/account.rb
@@ -368,6 +453,8 @@ files:
 - lib/sup/person.rb
 - lib/sup/colormap.rb
 - lib/sup/maildir.rb
+- lib/sup/interactive_lock.rb
+- lib/sup/service/label_service.rb
 - lib/sup/crypto.rb
 - lib/sup/search.rb
 - lib/sup/idle.rb
@@ -375,8 +462,6 @@ files:
 - lib/sup/buffer.rb
 - lib/sup/sent.rb
 - lib/sup/logger.rb
-- lib/sup/interactive-lock.rb
-- lib/sup/horizontal-selector.rb
 - lib/sup/draft.rb
 - lib/sup/contact.rb
 - lib/sup/update.rb
@@ -384,10 +469,11 @@ files:
 - lib/sup/label.rb
 - lib/sup/index.rb
 - lib/sup/poll.rb
+- lib/sup/message_chunks.rb
 - lib/sup/rfc2047.rb
 - lib/sup/textfield.rb
 - lib/sup.rb
-homepage: https://github.com/sup-heliotrope/sup/wiki
+homepage: http://supmua.org
 licenses:
 - GPL-2
 post_install_message: 
@@ -400,18 +486,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3761451823671182045
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3761451823671182045
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25